diff options
| author | aap <aap@papnet.eu> | 2020-05-12 09:44:50 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-12 09:45:01 +0200 |
| commit | fab453efdeb9acc304c7c84d3ebc9fed0629fa47 (patch) | |
| tree | deea28c132c538877d6608abad3cf7430ee8b96a /src/objects | |
| parent | Fix premake copy (diff) | |
| download | re3-fab453efdeb9acc304c7c84d3ebc9fed0629fa47.tar re3-fab453efdeb9acc304c7c84d3ebc9fed0629fa47.tar.gz re3-fab453efdeb9acc304c7c84d3ebc9fed0629fa47.tar.bz2 re3-fab453efdeb9acc304c7c84d3ebc9fed0629fa47.tar.lz re3-fab453efdeb9acc304c7c84d3ebc9fed0629fa47.tar.xz re3-fab453efdeb9acc304c7c84d3ebc9fed0629fa47.tar.zst re3-fab453efdeb9acc304c7c84d3ebc9fed0629fa47.zip | |
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/CutsceneHead.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/objects/CutsceneHead.cpp b/src/objects/CutsceneHead.cpp index 0938960e..55e75807 100644 --- a/src/objects/CutsceneHead.cpp +++ b/src/objects/CutsceneHead.cpp @@ -105,8 +105,11 @@ CCutsceneHead::Render(void) m_matrix.SetRotateY(PI/2); m_matrix = CMatrix(mat) * m_matrix; } + // This is head...it has no limbs +#ifndef FIX_BUGS RenderLimb(BONE_Lhand); RenderLimb(BONE_Rhand); +#endif }else #endif { @@ -127,11 +130,15 @@ CCutsceneHead::Render(void) void CCutsceneHead::RenderLimb(int32 bone) { + // It's not clear what this is... + // modelinfo for this object is not a ped so it also doesn't have any limbs +#ifndef FIX_BUGS RpAtomic *atomic; RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(m_parentObject->GetClump()); int idx = RpHAnimIDGetIndex(hier, bone); RwMatrix *mats = RpHAnimHierarchyGetMatrixArray(hier); - CPedModelInfo *mi = (CPedModelInfo *)CModelInfo::GetModelInfo(GetModelIndex()); + CPedModelInfo *mi = (CPedModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()); + assert(mi->GetModelType() == MITYPE_PED); switch(bone){ case BONE_Lhand: atomic = mi->getLeftHand(); @@ -148,6 +155,7 @@ CCutsceneHead::RenderLimb(int32 bone) RwFrameUpdateObjects(frame); RpAtomicRender(atomic); } +#endif } #endif |