summaryrefslogtreecommitdiffstats
path: root/src/animation/AnimBlendAssocGroup.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-01-08 20:53:11 +0100
committerSergeanur <s.anureev@yandex.ua>2021-01-08 20:53:11 +0100
commitfaa9e6441bc4b02362620d0cf599a8513744f4cc (patch)
treeb26eccf8fbbda2a4af0b7f0b3cdacdb6c4253cef /src/animation/AnimBlendAssocGroup.cpp
parentAdd multisampling (diff)
downloadre3-faa9e6441bc4b02362620d0cf599a8513744f4cc.tar
re3-faa9e6441bc4b02362620d0cf599a8513744f4cc.tar.gz
re3-faa9e6441bc4b02362620d0cf599a8513744f4cc.tar.bz2
re3-faa9e6441bc4b02362620d0cf599a8513744f4cc.tar.lz
re3-faa9e6441bc4b02362620d0cf599a8513744f4cc.tar.xz
re3-faa9e6441bc4b02362620d0cf599a8513744f4cc.tar.zst
re3-faa9e6441bc4b02362620d0cf599a8513744f4cc.zip
Diffstat (limited to 'src/animation/AnimBlendAssocGroup.cpp')
-rw-r--r--src/animation/AnimBlendAssocGroup.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp
index 83c1742a..df47e9b5 100644
--- a/src/animation/AnimBlendAssocGroup.cpp
+++ b/src/animation/AnimBlendAssocGroup.cpp
@@ -117,8 +117,8 @@ GetModelFromName(const char *name)
char playername[32];
if(strncasecmp(name, "CSplay", 6) == 0 &&
- strncasecmp(CModelInfo::GetModelInfo(MI_PLAYER)->GetName(), "ig", 2) == 0){
- strcpy(playername, CModelInfo::GetModelInfo(MI_PLAYER)->GetName());
+ strncasecmp(CModelInfo::GetModelInfo(MI_PLAYER)->GetModelName(), "ig", 2) == 0){
+ strcpy(playername, CModelInfo::GetModelInfo(MI_PLAYER)->GetModelName());
playername[0] = 'C';
playername[1] = 'S';
name = playername;
@@ -127,7 +127,7 @@ GetModelFromName(const char *name)
for(i = 0; i < MODELINFOSIZE; i++){
mi = CModelInfo::GetModelInfo(i);
if(mi && mi->GetRwObject() && RwObjectGetType(mi->GetRwObject()) == rpCLUMP &&
- strcmpIgnoringDigits(mi->GetName(), name))
+ strcmpIgnoringDigits(mi->GetModelName(), name))
return mi;
}
return nil;
@@ -149,7 +149,7 @@ CAnimBlendAssocGroup::CreateAssociations(const char *name)
CAnimBlendHierarchy *anim = CAnimManager::GetAnimation(animBlock->firstIndex + i);
CBaseModelInfo *model = GetModelFromName(anim->name);
if(model){
- debug("Associated anim %s with model %s\n", anim->name, model->GetName());
+ debug("Associated anim %s with model %s\n", anim->name, model->GetModelName());
RpClump *clump = (RpClump*)model->CreateInstance();
RpAnimBlendClumpInit(clump);
assocList[i].Init(clump, anim);