summaryrefslogtreecommitdiffstats
path: root/src/animation/AnimBlendAssociation.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-11 00:00:50 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-11 00:00:50 +0200
commit2f085ea5f585ac2a54bfa1eb51082b5f41a67184 (patch)
tree90b3006d9ff5aa65b753d27336d134d1cc783ce5 /src/animation/AnimBlendAssociation.h
parentsome changes (diff)
parentRpAnimBlend and frame updates (diff)
downloadre3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.tar
re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.tar.gz
re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.tar.bz2
re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.tar.lz
re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.tar.xz
re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.tar.zst
re3-2f085ea5f585ac2a54bfa1eb51082b5f41a67184.zip
Diffstat (limited to 'src/animation/AnimBlendAssociation.h')
-rw-r--r--src/animation/AnimBlendAssociation.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/animation/AnimBlendAssociation.h b/src/animation/AnimBlendAssociation.h
index dd5b11b0..7efd8099 100644
--- a/src/animation/AnimBlendAssociation.h
+++ b/src/animation/AnimBlendAssociation.h
@@ -12,12 +12,12 @@ enum {
ASSOC_PARTIAL = 0x10,
ASSOC_MOVEMENT = 0x20, // ???
ASSOC_HAS_TRANSLATION = 0x40,
- 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
+ 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_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
};
// Anim hierarchy associated with a clump
@@ -74,6 +74,7 @@ public:
void SetCurrentTime(float time);
void SyncAnimation(CAnimBlendAssociation *other);
void Start(float time);
+ void UpdateTimeStep(float timeDelta, float relSpeed);
bool UpdateTime(float timeDelta, float relSpeed);
bool UpdateBlend(float timeDelta);