diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-06-20 19:26:27 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-06-20 19:26:27 +0200 |
| commit | cc60ad1946794bfa8cc8ae86e62829035ff6f360 (patch) | |
| tree | 2710ee93888a29547e66887e3977a4fb2f375dc4 /src/animation/AnimManager.cpp | |
| parent | more weapon fixes (diff) | |
| download | re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.tar re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.tar.gz re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.tar.bz2 re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.tar.lz re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.tar.xz re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.tar.zst re3-cc60ad1946794bfa8cc8ae86e62829035ff6f360.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/animation/AnimManager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp index c2f1c8bc..385f1f67 100644 --- a/src/animation/AnimManager.cpp +++ b/src/animation/AnimManager.cpp @@ -237,14 +237,14 @@ AnimAssocDesc aMeleeAnimDescs[] = { { ANIM_MELEE_ATTACK, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_MELEE_ATTACK_2ND, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_MELEE_ATTACK_START, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_NOWALK }, - { ANIM_WEAPON_CROUCHRELOAD, ASSOC_REPEAT }, // TODO(Miami): Overload that name for melee/swing + { ANIM_MELEE_IDLE_FIGHTMODE, ASSOC_REPEAT }, { ANIM_WEAPON_SPECIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION }, // TODO(Miami): Overload that name for melee/swing }; 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_WEAPON_CROUCHRELOAD, ASSOC_REPEAT }, // TODO(Miami): Overload that name for melee/swing + { ANIM_MELEE_IDLE_FIGHTMODE, ASSOC_REPEAT }, { ANIM_WEAPON_SPECIAL, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, // TODO(Miami): Overload that name for melee/swing }; AnimAssocDesc aWeaponAnimDescs[] = { @@ -1006,6 +1006,7 @@ CAnimManager::UncompressAnimation(CAnimBlendHierarchy *hier) if(link == nil){ ms_animCache.tail.prev->item->RemoveUncompressedData(); ms_animCache.Remove(ms_animCache.tail.prev); + ms_animCache.tail.prev->item->linkPtr = nil; link = ms_animCache.Insert(hier); } hier->linkPtr = link; |