diff --git a/LEGO1/lego/legoomni/include/legoanimationmanager.h b/LEGO1/lego/legoomni/include/legoanimationmanager.h index 3e56cac9..0a658254 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& p_outExtraCharacterId); + void CopyToAnims(MxU32, 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/include/legonavcontroller.h b/LEGO1/lego/legoomni/include/legonavcontroller.h index ba20a1bc..fb95762b 100644 --- a/LEGO1/lego/legoomni/include/legonavcontroller.h +++ b/LEGO1/lego/legoomni/include/legonavcontroller.h @@ -74,7 +74,7 @@ class LegoNavController : public MxCore { ); static MxResult UpdateLocation(MxU32 p_location); static MxResult UpdateLocation(const char* p_location); - static MxS32 GetNumLocations(void); + static MxS32 GetNumLocations(); static LegoLocation* GetLocation(MxU32 p_location); inline void SetLinearVel(MxFloat p_linearVel) { m_linearVel = p_linearVel; } diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp index 94d5f91f..f5abb3c8 100644 --- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp +++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp @@ -2840,7 +2840,7 @@ AnimState::~AnimState() } // FUNCTION: LEGO1 0x100651d0 -void AnimState::CopyToAnims(MxU32 p_unused, AnimInfo* p_anims, MxU32& p_outExtraCharacterId) +void AnimState::CopyToAnims(MxU32, AnimInfo* p_anims, MxU32& p_outExtraCharacterId) { if (m_unk0x10 != NULL) { for (MxS32 i = 0; i < m_unk0x0c; i++) { @@ -2869,7 +2869,7 @@ void AnimState::InitFromAnims(MxU32 p_animsLength, AnimInfo* p_anims, MxU32 p_ex m_locationsFlags = new MxBool[numLocations]; } - this->m_extraCharacterId = p_extraCharacterId; + m_extraCharacterId = p_extraCharacterId; for (MxS32 i = 0; i < m_unk0x0c; i++) { m_unk0x10[i] = p_anims[i].m_unk0x22; @@ -2878,7 +2878,7 @@ void AnimState::InitFromAnims(MxU32 p_animsLength, AnimInfo* p_anims, MxU32 p_ex for (MxS32 j = 0; j < m_locationsFlagsLength; j++) { LegoLocation* location = LegoNavController::GetLocation(j); if (location != NULL) { - this->m_locationsFlags[j] = location->m_unk0x5c; + m_locationsFlags[j] = location->m_unk0x5c; } } } @@ -2968,5 +2968,6 @@ MxBool AnimState::SetFlag() return TRUE; } + return FALSE; } diff --git a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp index 3ffd2fb1..01facf17 100644 --- a/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp +++ b/LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp @@ -483,7 +483,7 @@ LegoLocation* LegoNavController::GetLocation(MxU32 p_location) } // FUNCTION: LEGO1 0x10055740 -MxS32 LegoNavController::GetNumLocations(void) +MxS32 LegoNavController::GetNumLocations() { return sizeOfArray(g_locations); }