diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h index a8209868..3e56cac9 100644 --- a/LEGO1/lego/legoomni/include/legoanimationmanager.h +++ b/LEGO1/lego/legoomni/include/legoanimationmanager.h @@ -71,7 +71,7 @@ class AnimState : public LegoState { MxBool SetFlag() override; // vtable+0x18 MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c - void CopyToAnims(MxU32 p_unused, AnimInfo* p_anims, MxU32& out_extraCharacterId); + void CopyToAnims(MxU32 p_unused, AnimInfo* p_anims, MxU32& p_outExtraCharacterId); void InitFromAnims(MxU32 p_animsLength, AnimInfo* p_anims, MxU32 p_extraCharacterId); // SYNTHETIC: LEGO1 0x10065130 diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index 03a6c65a..94d5f91f 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -2840,14 +2840,14 @@ AnimState::~AnimState() } // FUNCTION: LEGO1 0x100651d0 -void AnimState::CopyToAnims(MxU32 p_unused, AnimInfo* p_anims, MxU32& out_extraCharacterId) +void AnimState::CopyToAnims(MxU32 p_unused, AnimInfo* p_anims, MxU32& p_outExtraCharacterId) { if (m_unk0x10 != NULL) { for (MxS32 i = 0; i < m_unk0x0c; i++) { p_anims[i].m_unk0x22 = m_unk0x10[i]; } - out_extraCharacterId = m_extraCharacterId; + p_outExtraCharacterId = m_extraCharacterId; for (MxS32 j = 0; j < m_locationsFlagsLength; j++) { LegoLocation* location = LegoNavController::GetLocation(j); @@ -2864,9 +2864,9 @@ void AnimState::InitFromAnims(MxU32 p_animsLength, AnimInfo* p_anims, MxU32 p_ex if (m_unk0x10 == NULL) { m_unk0x0c = p_animsLength; m_unk0x10 = new MxU16[p_animsLength]; - MxS32 num_locations = LegoNavController::GetNumLocations(); - m_locationsFlagsLength = num_locations; - m_locationsFlags = new MxBool[num_locations]; + MxS32 numLocations = LegoNavController::GetNumLocations(); + m_locationsFlagsLength = numLocations; + m_locationsFlags = new MxBool[numLocations]; } this->m_extraCharacterId = p_extraCharacterId;