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

Match functions

Browse Source
This commit is contained in:
Christian Semmler 2024-03-19 10:04:43 -04:00
parent dc25b5ab94
commit 872052885c
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/src/common/legogamestate.cpp
View File

@ -30,7 +30,7 @@
#include <stdio.h> #include <stdio.h>
DECOMP_SIZE_ASSERT(LegoGameState::Username, 0xe) DECOMP_SIZE_ASSERT(LegoGameState::Username, 0x0e)
DECOMP_SIZE_ASSERT(LegoGameState::ScoreItem, 0x2c) DECOMP_SIZE_ASSERT(LegoGameState::ScoreItem, 0x2c)
DECOMP_SIZE_ASSERT(LegoGameState::History, 0x374) DECOMP_SIZE_ASSERT(LegoGameState::History, 0x374)
DECOMP_SIZE_ASSERT(LegoGameState, 0x430) DECOMP_SIZE_ASSERT(LegoGameState, 0x430)

17
LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
View File

@ -46,14 +46,10 @@ RegistrationBook::~RegistrationBook()
{ {
for (MxS16 i = 0; i < 10; i++) { for (MxS16 i = 0; i < 10; i++) {
for (MxS16 j = 0; j < 7; j++) { for (MxS16 j = 0; j < 7; j++) {
MxStillPresenter* presenter = m_name[i][j]; if (m_name[i][j] != NULL) {
if (presenter != NULL) { delete m_name[i][j]->GetAction();
if (presenter->GetAction() != NULL) { delete m_name[i][j];
delete presenter->GetAction(); m_name[i][j] = NULL;
}
delete presenter;
presenter = NULL;
} }
} }
} }
@ -130,9 +126,11 @@ MxLong RegistrationBook::HandleEndAction(MxEndActionNotificationParam& p_param)
if (p_param.GetAction()->GetAtomId() != m_atom) { if (p_param.GetAction()->GetAtomId() != m_atom) {
return 0; return 0;
} }
switch ((MxS16) p_param.GetAction()->GetObjectId()) {
switch ((MxS32) p_param.GetAction()->GetObjectId()) {
case RegbookScript::c_Textures: case RegbookScript::c_Textures:
m_unk0x2c1 = 0; m_unk0x2c1 = 0;
if (m_unk0x2b8 == 0) { if (m_unk0x2b8 == 0) {
TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE); TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, FALSE);
} }
@ -144,6 +142,7 @@ MxLong RegistrationBook::HandleEndAction(MxEndActionNotificationParam& p_param)
m_unk0xf8 = Timer()->GetTime(); m_unk0xf8 = Timer()->GetTime();
break; break;
} }
return 1; return 1;
} }