summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-16 22:54:44 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-16 22:54:44 +0200
commitad0b99231e31c5374a822a3f2173958f6a0ce517 (patch)
tree6f34ff5e3f023f35e3be33811690a5abb5caf561 /src
parentMore small audio fixes (diff)
downloadre3-ad0b99231e31c5374a822a3f2173958f6a0ce517.tar
re3-ad0b99231e31c5374a822a3f2173958f6a0ce517.tar.gz
re3-ad0b99231e31c5374a822a3f2173958f6a0ce517.tar.bz2
re3-ad0b99231e31c5374a822a3f2173958f6a0ce517.tar.lz
re3-ad0b99231e31c5374a822a3f2173958f6a0ce517.tar.xz
re3-ad0b99231e31c5374a822a3f2173958f6a0ce517.tar.zst
re3-ad0b99231e31c5374a822a3f2173958f6a0ce517.zip
Diffstat (limited to 'src')
-rw-r--r--src/animation/AnimManager.cpp53
1 files changed, 28 insertions, 25 deletions
diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp
index 8fb1576c..444b6d45 100644
--- a/src/animation/AnimManager.cpp
+++ b/src/animation/AnimManager.cpp
@@ -530,33 +530,36 @@ char const *aRocketStrafeRightAnimations[] = {
"idle_rocket",
"walkst_rocket_right",
};
+
+#define awc(a) ARRAY_SIZE(a), a
const AnimAssocDefinition CAnimManager::ms_aAnimAssocDefinitions[NUM_ANIM_ASSOC_GROUPS] = {
- { "man", "ped", MI_COP, 173, aStdAnimations, aStdAnimDescs },
- { "player", "ped", MI_COP, 5, aPlayerAnimations, aStdAnimDescs },
- { "playerrocket", "ped", MI_COP, 5, aPlayerWithRocketAnimations, aStdAnimDescs },
- { "player1armed", "ped", MI_COP, 5, aPlayer1ArmedAnimations, aStdAnimDescs },
- { "player2armed", "ped", MI_COP, 5, aPlayer2ArmedAnimations, aStdAnimDescs },
- { "playerBBBat", "ped", MI_COP, 5, aPlayerBBBatAnimations, aStdAnimDescs },
- { "shuffle", "ped", MI_COP, 4, aShuffleAnimations, aStdAnimDescs },
- { "oldman", "ped", MI_COP, 4, aOldAnimations, aStdAnimDescs },
- { "gang1", "ped", MI_COP, 4, aGang1Animations, aStdAnimDescs },
- { "gang2", "ped", MI_COP, 4, aGang2Animations, aStdAnimDescs },
- { "fatman", "ped", MI_COP, 4, aFatAnimations, aStdAnimDescs },
- { "oldfatman", "ped", MI_COP, 4, aOldFatAnimations, aStdAnimDescs },
- { "woman", "ped", MI_COP, 4, aStdWomanAnimations, aStdAnimDescs },
- { "shopping", "ped", MI_COP, 4, aWomanShopAnimations, aStdAnimDescs },
- { "busywoman", "ped", MI_COP, 4, aBusyWomanAnimations, aStdAnimDescs },
- { "sexywoman", "ped", MI_COP, 4, aSexyWomanAnimations, aStdAnimDescs },
- { "oldwoman", "ped", MI_COP, 4, aOldWomanAnimations, aStdAnimDescs },
- { "fatwoman", "ped", MI_COP, 4, aFatWomanAnimations, aStdAnimDescs },
- { "panicchunky", "ped", MI_COP, 4, aPanicChunkyAnimations, aStdAnimDescs },
- { "playerback", "ped", MI_COP, 5, aPlayerStrafeBackAnimations, aStdAnimDescs },
- { "playerleft", "ped", MI_COP, 5, aPlayerStrafeLeftAnimations, aStdAnimDescsSide },
- { "playerright", "ped", MI_COP, 5, aPlayerStrafeRightAnimations, aStdAnimDescsSide },
- { "rocketback", "ped", MI_COP, 5, aRocketStrafeBackAnimations, aStdAnimDescs },
- { "rocketleft", "ped", MI_COP, 5, aRocketStrafeLeftAnimations, aStdAnimDescsSide },
- { "rocketright", "ped", MI_COP, 5, aRocketStrafeRightAnimations, aStdAnimDescsSide },
+ { "man", "ped", MI_COP, awc(aStdAnimations), aStdAnimDescs },
+ { "player", "ped", MI_COP, awc(aPlayerAnimations), aStdAnimDescs },
+ { "playerrocket", "ped", MI_COP, awc(aPlayerWithRocketAnimations), aStdAnimDescs },
+ { "player1armed", "ped", MI_COP, awc(aPlayer1ArmedAnimations), aStdAnimDescs },
+ { "player2armed", "ped", MI_COP, awc(aPlayer2ArmedAnimations), aStdAnimDescs },
+ { "playerBBBat", "ped", MI_COP, awc(aPlayerBBBatAnimations), aStdAnimDescs },
+ { "shuffle", "ped", MI_COP, awc(aShuffleAnimations), aStdAnimDescs },
+ { "oldman", "ped", MI_COP, awc(aOldAnimations), aStdAnimDescs },
+ { "gang1", "ped", MI_COP, awc(aGang1Animations), aStdAnimDescs },
+ { "gang2", "ped", MI_COP, awc(aGang2Animations), aStdAnimDescs },
+ { "fatman", "ped", MI_COP, awc(aFatAnimations), aStdAnimDescs },
+ { "oldfatman", "ped", MI_COP, awc(aOldFatAnimations), aStdAnimDescs },
+ { "woman", "ped", MI_COP, awc(aStdWomanAnimations), aStdAnimDescs },
+ { "shopping", "ped", MI_COP, awc(aWomanShopAnimations), aStdAnimDescs },
+ { "busywoman", "ped", MI_COP, awc(aBusyWomanAnimations), aStdAnimDescs },
+ { "sexywoman", "ped", MI_COP, awc(aSexyWomanAnimations), aStdAnimDescs },
+ { "oldwoman", "ped", MI_COP, awc(aOldWomanAnimations), aStdAnimDescs },
+ { "fatwoman", "ped", MI_COP, awc(aFatWomanAnimations), aStdAnimDescs },
+ { "panicchunky", "ped", MI_COP, awc(aPanicChunkyAnimations), aStdAnimDescs },
+ { "playerback", "ped", MI_COP, awc(aPlayerStrafeBackAnimations), aStdAnimDescs },
+ { "playerleft", "ped", MI_COP, awc(aPlayerStrafeLeftAnimations), aStdAnimDescsSide },
+ { "playerright", "ped", MI_COP, awc(aPlayerStrafeRightAnimations), aStdAnimDescsSide },
+ { "rocketback", "ped", MI_COP, awc(aRocketStrafeBackAnimations), aStdAnimDescs },
+ { "rocketleft", "ped", MI_COP, awc(aRocketStrafeLeftAnimations), aStdAnimDescsSide },
+ { "rocketright", "ped", MI_COP, awc(aRocketStrafeRightAnimations), aStdAnimDescsSide },
};
+#undef awc
void
CAnimManager::Initialise(void)