summaryrefslogtreecommitdiffstats
path: root/src/animation/AnimManager.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-08 20:58:40 +0200
committeraap <aap@papnet.eu>2020-05-08 20:58:40 +0200
commitf12e76fa135db3ca0a98c441cc3f5c0a4a14549d (patch)
tree29774d79de544892972dd8b1e31b5404353dd1ca /src/animation/AnimManager.cpp
parentsmall fixes (diff)
downloadre3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.tar
re3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.tar.gz
re3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.tar.bz2
re3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.tar.lz
re3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.tar.xz
re3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.tar.zst
re3-f12e76fa135db3ca0a98c441cc3f5c0a4a14549d.zip
Diffstat (limited to '')
-rw-r--r--src/animation/AnimManager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp
index ebd2e1fb..f21b3fed 100644
--- a/src/animation/AnimManager.cpp
+++ b/src/animation/AnimManager.cpp
@@ -11,8 +11,8 @@
#include "AnimBlendAssocGroup.h"
#include "AnimManager.h"
-CAnimBlock CAnimManager::ms_aAnimBlocks[2];
-CAnimBlendHierarchy CAnimManager::ms_aAnimations[250];
+CAnimBlock CAnimManager::ms_aAnimBlocks[NUMANIMBLOCKS];
+CAnimBlendHierarchy CAnimManager::ms_aAnimations[NUMANIMATIONS];
int32 CAnimManager::ms_numAnimBlocks;
int32 CAnimManager::ms_numAnimations;
CAnimBlendAssocGroup *CAnimManager::ms_aAnimAssocGroups;
@@ -750,8 +750,8 @@ CAnimManager::LoadAnimFiles(void)
CBaseModelInfo *mi = CModelInfo::GetModelInfo(ms_aAnimAssocDefinitions[i].modelIndex);
RpClump *clump = (RpClump*)mi->CreateInstance();
RpAnimBlendClumpInit(clump);
- CAnimBlendAssocGroup *group = &CAnimManager::ms_aAnimAssocGroups[i];
- const AnimAssocDefinition *def = &CAnimManager::ms_aAnimAssocDefinitions[i];
+ CAnimBlendAssocGroup *group = &ms_aAnimAssocGroups[i];
+ const AnimAssocDefinition *def = &ms_aAnimAssocDefinitions[i];
group->CreateAssociations(def->blockName, clump, def->animNames, def->numAnims);
for(j = 0; j < group->numAssociations; j++)
group->GetAnimation(j)->flags |= def->animDescs[j].flags;