diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-08 23:02:17 +0100 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-08 23:02:17 +0100 |
| commit | 91c6389754204c7cc419cecb4b73d576106890c3 (patch) | |
| tree | 99ee9b860a2739d0ffee7b5d88d8d50c0de4283d /src/animation/AnimBlendAssocGroup.cpp | |
| parent | sync with re3 (diff) | |
| parent | Use original names (diff) | |
| download | re3-91c6389754204c7cc419cecb4b73d576106890c3.tar re3-91c6389754204c7cc419cecb4b73d576106890c3.tar.gz re3-91c6389754204c7cc419cecb4b73d576106890c3.tar.bz2 re3-91c6389754204c7cc419cecb4b73d576106890c3.tar.lz re3-91c6389754204c7cc419cecb4b73d576106890c3.tar.xz re3-91c6389754204c7cc419cecb4b73d576106890c3.tar.zst re3-91c6389754204c7cc419cecb4b73d576106890c3.zip | |
Diffstat (limited to 'src/animation/AnimBlendAssocGroup.cpp')
| -rw-r--r-- | src/animation/AnimBlendAssocGroup.cpp | 8 |
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); |