summaryrefslogtreecommitdiffstats
path: root/src/animation/CutsceneMgr.cpp
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2021-01-08 23:02:17 +0100
committerFire-Head <Fire-Head@users.noreply.github.com>2021-01-08 23:02:17 +0100
commit91c6389754204c7cc419cecb4b73d576106890c3 (patch)
tree99ee9b860a2739d0ffee7b5d88d8d50c0de4283d /src/animation/CutsceneMgr.cpp
parentsync with re3 (diff)
parentUse original names (diff)
downloadre3-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/CutsceneMgr.cpp')
-rw-r--r--src/animation/CutsceneMgr.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/animation/CutsceneMgr.cpp b/src/animation/CutsceneMgr.cpp
index 003385da..eeec2728 100644
--- a/src/animation/CutsceneMgr.cpp
+++ b/src/animation/CutsceneMgr.cpp
@@ -383,7 +383,7 @@ CCutsceneMgr::CreateCutsceneObject(int modelId)
CCutsceneObject *pCutsceneObject;
CStreaming::ImGonnaUseStreamingMemory();
- debug("Created cutscene object %s\n", CModelInfo::GetModelInfo(modelId)->GetName());
+ debug("Created cutscene object %s\n", CModelInfo::GetModelInfo(modelId)->GetModelName());
if (modelId >= MI_CUTOBJ01 && modelId <= MI_CUTOBJ05) {
pModelInfo = CModelInfo::GetModelInfo(modelId);
pColModel = &CTempColModels::ms_colModelCutObj[modelId - MI_CUTOBJ01];
@@ -569,7 +569,7 @@ CCutsceneMgr::AttachObjectToParent(CObject *pObject, CEntity *pAttachTo)
((CCutsceneObject*)pObject)->m_pAttachmentObject = nil;
((CCutsceneObject*)pObject)->m_pAttachTo = RpClumpGetFrame(pAttachTo->GetClump());
- debug("Attach %s to %s\n", CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetName(), CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetName());
+ debug("Attach %s to %s\n", CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetModelName(), CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetModelName());
}
void
@@ -578,9 +578,9 @@ CCutsceneMgr::AttachObjectToFrame(CObject *pObject, CEntity *pAttachTo, const ch
((CCutsceneObject*)pObject)->m_pAttachmentObject = nil;
((CCutsceneObject*)pObject)->m_pAttachTo = RpAnimBlendClumpFindFrame(pAttachTo->GetClump(), frame)->frame;
debug("Attach %s to component %s of %s\n",
- CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetName(),
+ CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetModelName(),
frame,
- CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetName());
+ CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetModelName());
if (RwObjectGetType(pObject->m_rwObject) == rpCLUMP) {
RpClump *clump = (RpClump*)pObject->m_rwObject;
if (IsClumpSkinned(clump))
@@ -597,8 +597,8 @@ CCutsceneMgr::AttachObjectToBone(CObject *pObject, CObject *pAttachTo, int bone)
((CCutsceneObject*)pObject)->m_pAttachmentObject = pAttachTo;
((CCutsceneObject*)pObject)->m_pAttachTo = &matrixArray[id];
debug("Attach %s to %s\n",
- CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetName(),
- CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetName());
+ CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetModelName(),
+ CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetModelName());
}
void