diff --git a/LEGO1/lego/legoomni/include/legoanimactor.h b/LEGO1/lego/legoomni/include/legoanimactor.h index bc673b74..5191a7b5 100644 --- a/LEGO1/lego/legoomni/include/legoanimactor.h +++ b/LEGO1/lego/legoomni/include/legoanimactor.h @@ -9,7 +9,9 @@ struct LegoAnimActorStruct { LegoAnimActorStruct(float p_unk0x00, LegoAnim* p_AnimTreePtr, LegoROI** p_roiMap, MxU32 p_numROIs); ~LegoAnimActorStruct(); + float GetDuration(); + float m_unk0x00; // 0x00 LegoAnim* m_AnimTreePtr; // 0x04 LegoROI** m_roiMap; // 0x08 diff --git a/LEGO1/lego/legoomni/include/legopathcontroller.h b/LEGO1/lego/legoomni/include/legopathcontroller.h index 4c69a157..35bf5aa5 100644 --- a/LEGO1/lego/legoomni/include/legopathcontroller.h +++ b/LEGO1/lego/legoomni/include/legopathcontroller.h @@ -9,7 +9,7 @@ class LegoPathBoundary; class LegoWorld; struct LegoPathControllerComparator { - MxBool operator()(undefined*, undefined*) const { return 0; } + MxBool operator()(const undefined*, const undefined*) const { return 0; } }; // VTABLE: LEGO1 0x100d7d60 diff --git a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp index b9cf8fe4..b600ab4b 100644 --- a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp +++ b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp @@ -45,8 +45,8 @@ LegoAnimActor::~LegoAnimActor() // FUNCTION: LEGO1 0x1001c1f0 MxResult LegoAnimActor::FUN_1001c1f0(float& p_out) { - p_out = m_unk0x80 - (float) m_animMaps[m_curAnim]->m_AnimTreePtr->GetDuration() * - ((MxS32) (m_unk0x80 / (float) m_animMaps[m_curAnim]->m_AnimTreePtr->GetDuration())); + float duration = (float) m_animMaps[m_curAnim]->m_AnimTreePtr->GetDuration(); + p_out = m_unk0x80 - duration * ((MxS32) (m_unk0x80 / duration)); return SUCCESS; }