summaryrefslogtreecommitdiffstats
path: root/src/animation
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2021-01-08 21:30:35 +0100
committerFire-Head <Fire-Head@users.noreply.github.com>2021-01-08 21:30:35 +0100
commit39a121351de14f193f2f4efcbaef368d80ccfba9 (patch)
tree7fa767968e8e838b68894ff21c284c5f6c9338dc /src/animation
parent.ini for scaling, radar, sprites (diff)
parentUse original names (diff)
downloadre3-39a121351de14f193f2f4efcbaef368d80ccfba9.tar
re3-39a121351de14f193f2f4efcbaef368d80ccfba9.tar.gz
re3-39a121351de14f193f2f4efcbaef368d80ccfba9.tar.bz2
re3-39a121351de14f193f2f4efcbaef368d80ccfba9.tar.lz
re3-39a121351de14f193f2f4efcbaef368d80ccfba9.tar.xz
re3-39a121351de14f193f2f4efcbaef368d80ccfba9.tar.zst
re3-39a121351de14f193f2f4efcbaef368d80ccfba9.zip
Diffstat (limited to '')
-rw-r--r--src/animation/AnimBlendAssocGroup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/animation/AnimBlendAssocGroup.cpp b/src/animation/AnimBlendAssocGroup.cpp
index fe419f2a..1d234bb8 100644
--- a/src/animation/AnimBlendAssocGroup.cpp
+++ b/src/animation/AnimBlendAssocGroup.cpp
@@ -111,7 +111,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;
@@ -134,7 +134,7 @@ CAnimBlendAssocGroup::CreateAssociations(const char *name)
CAnimBlendHierarchy *anim = CAnimManager::GetAnimation(animBlock->firstIndex + i);
CBaseModelInfo *model = GetModelFromName(anim->name);
assert(model);
- printf("Associated anim %s with model %s\n", anim->name, model->GetName());
+ printf("Associated anim %s with model %s\n", anim->name, model->GetModelName());
RpClump *clump = (RpClump*)model->CreateInstance();
#ifdef PED_SKIN
if(IsClumpSkinned(clump))