summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-01-08 17:24:53 +0100
committerSergeanur <s.anureev@yandex.ua>2021-01-08 17:24:53 +0100
commitc6c55d0130a9f4d43447a63e48f5fc9b76e764e8 (patch)
tree1d9712e7c9a1f92e4755ee0d3c1bddd834669178 /src
parentwtf (diff)
downloadre3-c6c55d0130a9f4d43447a63e48f5fc9b76e764e8.tar
re3-c6c55d0130a9f4d43447a63e48f5fc9b76e764e8.tar.gz
re3-c6c55d0130a9f4d43447a63e48f5fc9b76e764e8.tar.bz2
re3-c6c55d0130a9f4d43447a63e48f5fc9b76e764e8.tar.lz
re3-c6c55d0130a9f4d43447a63e48f5fc9b76e764e8.tar.xz
re3-c6c55d0130a9f4d43447a63e48f5fc9b76e764e8.tar.zst
re3-c6c55d0130a9f4d43447a63e48f5fc9b76e764e8.zip
Diffstat (limited to 'src')
-rw-r--r--src/animation/AnimManager.cpp4
-rw-r--r--src/animation/AnimationId.h4
-rw-r--r--src/peds/PedAI.cpp4
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) {