summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-05-29 21:05:33 +0200
committereray orçunus <erayorcunus@gmail.com>2020-05-29 21:05:33 +0200
commit529cec565380b3c6689641ea427a1bf973014e02 (patch)
tree6caafab9dece0f1233f7ac9899d57b83ff421cce /src/animation
parentMerge pull request #603 from Fire-Head/miami (diff)
downloadre3-529cec565380b3c6689641ea427a1bf973014e02.tar
re3-529cec565380b3c6689641ea427a1bf973014e02.tar.gz
re3-529cec565380b3c6689641ea427a1bf973014e02.tar.bz2
re3-529cec565380b3c6689641ea427a1bf973014e02.tar.lz
re3-529cec565380b3c6689641ea427a1bf973014e02.tar.xz
re3-529cec565380b3c6689641ea427a1bf973014e02.tar.zst
re3-529cec565380b3c6689641ea427a1bf973014e02.zip
Diffstat (limited to '')
-rw-r--r--src/animation/AnimBlendAssociation.h2
-rw-r--r--src/animation/AnimManager.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/animation/AnimBlendAssociation.h b/src/animation/AnimBlendAssociation.h
index f6d98fc3..dbfcb722 100644
--- a/src/animation/AnimBlendAssociation.h
+++ b/src/animation/AnimBlendAssociation.h
@@ -14,7 +14,7 @@ enum {
ASSOC_HAS_TRANSLATION = 0x40,
ASSOC_HAS_X_TRANSLATION = 0x80, // for 2d velocity extraction
ASSOC_WALK = 0x100, // for CPed::PlayFootSteps(void)
- ASSOC_FLAG_XPRESS = 0x200, // only used by xpress scratch, see CPed::Chat(void)
+ ASSOC_IDLE = 0x200, // only xpress scratch has it by default, but game adds it to player's idle animations later
ASSOC_NOWALK = 0x400, // see CPed::PlayFootSteps(void)
ASSOC_BLOCK = 0x800, // unused in assoc description, blocks other anims from being played
ASSOC_FRONTAL = 0x1000, // anims that we fall to front
diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp
index 16207f54..fab28c8d 100644
--- a/src/animation/AnimManager.cpp
+++ b/src/animation/AnimManager.cpp
@@ -174,7 +174,7 @@ AnimAssocDesc aStdAnimDescs[] = {
{ ANIM_FALL_FRONT, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL | ASSOC_FRONTAL },
{ ANIM_EV_STEP, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },
{ ANIM_EV_DIVE, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION | ASSOC_FRONTAL },
- { ANIM_XPRESS_SCRATCH, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_FLAG_XPRESS },
+ { ANIM_XPRESS_SCRATCH, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL | ASSOC_IDLE },
{ ANIM_ROAD_CROSS, ASSOC_REPEAT | ASSOC_PARTIAL },
{ ANIM_TURN_180, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
{ ANIM_ARREST_GUN, ASSOC_PARTIAL | ASSOC_HAS_TRANSLATION },