diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-07-08 16:26:23 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-07-09 16:01:07 +0200 |
| commit | 67a3c7d2ee2787b254099bf22a9c261146ce5eed (patch) | |
| tree | 70124341489b7293a9d4eccfe2d74df263ab5e3e /src/animation/AnimManager.cpp | |
| parent | Merge pull request #652 from Domiiniik/miami (diff) | |
| download | re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.tar re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.tar.gz re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.tar.bz2 re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.tar.lz re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.tar.xz re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.tar.zst re3-67a3c7d2ee2787b254099bf22a9c261146ce5eed.zip | |
Diffstat (limited to 'src/animation/AnimManager.cpp')
| -rw-r--r-- | src/animation/AnimManager.cpp | 4 |
1 files changed, 2 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 }, |