summaryrefslogtreecommitdiffstats
path: root/src/animation/AnimBlendAssociation.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-09 09:50:00 +0200
committeraap <aap@papnet.eu>2020-05-09 09:51:31 +0200
commite8c0619226a9da7ac40759b33df5d73d1f622c8e (patch)
treeebb07a56421b46f9ca5952be3d8233cb4c9dec31 /src/animation/AnimBlendAssociation.h
parentMerge branch 'master' into miami (diff)
downloadre3-e8c0619226a9da7ac40759b33df5d73d1f622c8e.tar
re3-e8c0619226a9da7ac40759b33df5d73d1f622c8e.tar.gz
re3-e8c0619226a9da7ac40759b33df5d73d1f622c8e.tar.bz2
re3-e8c0619226a9da7ac40759b33df5d73d1f622c8e.tar.lz
re3-e8c0619226a9da7ac40759b33df5d73d1f622c8e.tar.xz
re3-e8c0619226a9da7ac40759b33df5d73d1f622c8e.tar.zst
re3-e8c0619226a9da7ac40759b33df5d73d1f622c8e.zip
Diffstat (limited to 'src/animation/AnimBlendAssociation.h')
-rw-r--r--src/animation/AnimBlendAssociation.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/animation/AnimBlendAssociation.h b/src/animation/AnimBlendAssociation.h
index 19ead49c..dd5b11b0 100644
--- a/src/animation/AnimBlendAssociation.h
+++ b/src/animation/AnimBlendAssociation.h
@@ -5,7 +5,6 @@
#include "AnimBlendHierarchy.h"
enum {
- // TODO
ASSOC_RUNNING = 1,
ASSOC_REPEAT = 2,
ASSOC_DELETEFADEDOUT = 4,
@@ -13,13 +12,12 @@ enum {
ASSOC_PARTIAL = 0x10,
ASSOC_MOVEMENT = 0x20, // ???
ASSOC_HAS_TRANSLATION = 0x40,
- ASSOC_FLAG80 = 0x80, // used for footstep sound calculation
- ASSOC_FLAG100 = 0x100,
- ASSOC_FLAG200 = 0x200,
- ASSOC_FLAG400 = 0x400, // unused, blending it with move anims makes them stop. 0x800 in VC
- ASSOC_FLAG800 = 0x800, // anims that we fall to front. 0x1000 in VC
- ASSOC_HAS_X_TRANSLATION = 0x1000,
- // 0x2000 is vehicle anims in VC
+ ASSOC_WALK = 0x80, // for CPed::PlayFootSteps(void)
+ ASSOC_FLAG_XPRESS = 0x100, // only used by xpress scratch, see CPed::Chat(void)
+ ASSOC_NOWALK = 0x200, // see CPed::PlayFootSteps(void)
+ ASSOC_BLOCK = 0x400, // unused in assoc description, blocks other anims from being played
+ ASSOC_FRONTAL = 0x800, // anims that we fall to front
+ ASSOC_HAS_X_TRANSLATION = 0x1000, // for 2d velocity extraction
};
// Anim hierarchy associated with a clump