diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-08 17:24:53 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-08 17:25:35 +0100 |
| commit | 95260371cbc01426dd6ab13499886878db3479ba (patch) | |
| tree | c8a5818e1835e92b32c96bedb90cb5685abc3511 | |
| parent | Allocator fix (diff) | |
| download | re3-95260371cbc01426dd6ab13499886878db3479ba.tar re3-95260371cbc01426dd6ab13499886878db3479ba.tar.gz re3-95260371cbc01426dd6ab13499886878db3479ba.tar.bz2 re3-95260371cbc01426dd6ab13499886878db3479ba.tar.lz re3-95260371cbc01426dd6ab13499886878db3479ba.tar.xz re3-95260371cbc01426dd6ab13499886878db3479ba.tar.zst re3-95260371cbc01426dd6ab13499886878db3479ba.zip | |
| -rw-r--r-- | src/animation/AnimManager.cpp | 4 | ||||
| -rw-r--r-- | src/animation/AnimationId.h | 4 | ||||
| -rw-r--r-- | src/peds/PedAI.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp index 9fc54654..607dfe26 100644 --- a/src/animation/AnimManager.cpp +++ b/src/animation/AnimManager.cpp @@ -153,8 +153,8 @@ AnimAssocDesc aStdAnimDescs[] = { { ANIM_CAR_GETOUT_LOW_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_CAR_CLOSE_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_CAR_HOOKERTALK, ASSOC_REPEAT | ASSOC_PARTIAL }, - { ANIM_IDLE_STANCE2, ASSOC_PARTIAL }, - { ANIM_IDLE_STANCE3, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, + { ANIM_TRAIN_GETIN, ASSOC_PARTIAL }, + { ANIM_TRAIN_GETOUT, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_CAR_CRAWLOUT_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_CAR_CRAWLOUT_RHS2, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL }, { ANIM_CAR_ROLLOUT_LHS, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_HAS_X_TRANSLATION }, diff --git a/src/animation/AnimationId.h b/src/animation/AnimationId.h index f2ef3dfd..cf8b9fe0 100644 --- a/src/animation/AnimationId.h +++ b/src/animation/AnimationId.h @@ -140,8 +140,8 @@ enum AnimationId ANIM_CAR_CLOSE_RHS, ANIM_CAR_HOOKERTALK, - ANIM_IDLE_STANCE2, - ANIM_IDLE_STANCE3, + ANIM_TRAIN_GETIN, + ANIM_TRAIN_GETOUT, ANIM_CAR_CRAWLOUT_RHS, ANIM_CAR_CRAWLOUT_RHS2, diff --git a/src/peds/PedAI.cpp b/src/peds/PedAI.cpp index 16e6c8e2..de82524d 100644 --- a/src/peds/PedAI.cpp +++ b/src/peds/PedAI.cpp @@ -4914,8 +4914,8 @@ CPed::SetAnimOffsetForEnterOrExitVehicle(void) vecPedVanRearDoorAnimOffset = lastFrame->translation; } } - // I think this is leftover and ANIM_TRAIN_GETOUT - enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, ANIM_IDLE_STANCE3)->hierarchy; + + enterAssoc = CAnimManager::GetAnimAssociation(ASSOCGRP_STD, ANIM_TRAIN_GETOUT)->hierarchy; seq = enterAssoc->sequences; CAnimManager::UncompressAnimation(enterAssoc); if (seq->numFrames > 0) { |