diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-07-08 17:26:23 +0300 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-07-09 17:01:07 +0300 |
| commit | 67a3c7d2ee2787b254099bf22a9c261146ce5eed (patch) | |
| tree | 70124341489b7293a9d4eccfe2d74df263ab5e3e /src/animation | |
| parent | 515559d00cdaae6634c84faa3a3338f7db9cc6ac (diff) | |
VC fighting, Peds, many fixes including ghost bikes
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/AnimManager.cpp | 4 | ||||
| -rw-r--r-- | src/animation/AnimationId.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp index 4694920a..f682964f 100644 --- a/src/animation/AnimManager.cpp +++ b/src/animation/AnimManager.cpp @@ -238,14 +238,14 @@ AnimAssocDesc aMeleeAnimDescs[] = { { ANIM_MELEE_ATTACK_2ND, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_MELEE_ATTACK_START, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK }, { ANIM_MELEE_IDLE_FIGHTMODE, ASSOC_REPEAT }, - { ANIM_WEAPON_SPECIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION }, // TODO(Miami): Overload that name for melee/swing + { ANIM_MELEE_ATTACK_FINISH, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION }, }; AnimAssocDesc aSwingAnimDescs[] = { { ANIM_MELEE_ATTACK, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_MELEE_ATTACK_2ND, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_MELEE_ATTACK_START, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_MELEE_IDLE_FIGHTMODE, ASSOC_REPEAT }, - { ANIM_WEAPON_SPECIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, // TODO(Miami): Overload that name for melee/swing + { ANIM_MELEE_ATTACK_FINISH, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, }; AnimAssocDesc aWeaponAnimDescs[] = { { ANIM_WEAPON_FIRE, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, diff --git a/src/animation/AnimationId.h b/src/animation/AnimationId.h index ddf36b23..f2ef3dfd 100644 --- a/src/animation/AnimationId.h +++ b/src/animation/AnimationId.h @@ -234,6 +234,7 @@ enum AnimationId ANIM_MELEE_ATTACK_2ND, ANIM_MELEE_ATTACK_START, ANIM_MELEE_IDLE_FIGHTMODE, + ANIM_MELEE_ATTACK_FINISH, ANIM_THROWABLE_THROW = ANIM_WEAPON_FIRE, ANIM_THROWABLE_THROWU, ANIM_THROWABLE_START_THROW, |