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

fix ncc complaints

Browse Source
This commit is contained in:
jonschz 2024-06-21 13:51:24 +02:00
parent 98eeaadaec
commit 14a59fb29c
2 changed files with 6 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& out_extraCharacterId); void CopyToAnims(MxU32 p_unused, 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

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

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