isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-23 16:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: address review comments

Browse Source
This commit is contained in:
jonschz 2024-06-21 20:03:54 +02:00
parent 14a59fb29c
commit 4d061d6dd9
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legoanimationmanager.h
View File

@ -71,7 +71,7 @@ class AnimState : public LegoState {
MxBool SetFlag() override; // vtable+0x18 MxBool SetFlag() override; // vtable+0x18
MxResult Serialize(LegoFile* p_file) override; // vtable+0x1c 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); void InitFromAnims(MxU32 p_animsLength, AnimInfo* p_anims, MxU32 p_extraCharacterId);
// SYNTHETIC: LEGO1 0x10065130 // SYNTHETIC: LEGO1 0x10065130

2
LEGO1/lego/legoomni/include/legonavcontroller.h
View File

@ -74,7 +74,7 @@ class LegoNavController : public MxCore {
); );
static MxResult UpdateLocation(MxU32 p_location); static MxResult UpdateLocation(MxU32 p_location);
static MxResult UpdateLocation(const char* p_location); static MxResult UpdateLocation(const char* p_location);
static MxS32 GetNumLocations(void); static MxS32 GetNumLocations();
static LegoLocation* GetLocation(MxU32 p_location); static LegoLocation* GetLocation(MxU32 p_location);
inline void SetLinearVel(MxFloat p_linearVel) { m_linearVel = p_linearVel; } inline void SetLinearVel(MxFloat p_linearVel) { m_linearVel = p_linearVel; }

7
LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
View File

@ -2840,7 +2840,7 @@ AnimState::~AnimState()
} }
// FUNCTION: LEGO1 0x100651d0 // 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) { if (m_unk0x10 != NULL) {
for (MxS32 i = 0; i < m_unk0x0c; i++) { 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]; m_locationsFlags = new MxBool[numLocations];
} }
this->m_extraCharacterId = p_extraCharacterId; m_extraCharacterId = p_extraCharacterId;
for (MxS32 i = 0; i < m_unk0x0c; i++) { for (MxS32 i = 0; i < m_unk0x0c; i++) {
m_unk0x10[i] = p_anims[i].m_unk0x22; 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++) { for (MxS32 j = 0; j < m_locationsFlagsLength; j++) {
LegoLocation* location = LegoNavController::GetLocation(j); LegoLocation* location = LegoNavController::GetLocation(j);
if (location != NULL) { 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 TRUE;
} }
return FALSE; return FALSE;
} }

2
LEGO1/lego/legoomni/src/entity/legonavcontroller.cpp
View File

@ -483,7 +483,7 @@ LegoLocation* LegoNavController::GetLocation(MxU32 p_location)
} }
// FUNCTION: LEGO1 0x10055740 // FUNCTION: LEGO1 0x10055740
MxS32 LegoNavController::GetNumLocations(void) MxS32 LegoNavController::GetNumLocations()
{ {
return sizeOfArray(g_locations); return sizeOfArray(g_locations);
} }