summaryrefslogtreecommitdiffstats
path: root/src/animation/AnimManager.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-09 01:51:40 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-09 01:51:40 +0200
commitd686f587ccf69e533bf95b8fa4e18db82d710890 (patch)
tree48b4429d0e167a0ff75cce8b63f5024b396408bb /src/animation/AnimManager.cpp
parentFix corona scaling (diff)
parentMerge branch 'master' of github.com:GTAmodding/re3 (diff)
downloadre3-d686f587ccf69e533bf95b8fa4e18db82d710890.tar
re3-d686f587ccf69e533bf95b8fa4e18db82d710890.tar.gz
re3-d686f587ccf69e533bf95b8fa4e18db82d710890.tar.bz2
re3-d686f587ccf69e533bf95b8fa4e18db82d710890.tar.lz
re3-d686f587ccf69e533bf95b8fa4e18db82d710890.tar.xz
re3-d686f587ccf69e533bf95b8fa4e18db82d710890.tar.zst
re3-d686f587ccf69e533bf95b8fa4e18db82d710890.zip
Diffstat (limited to 'src/animation/AnimManager.cpp')
-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;