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

Address review comment

Browse Source
This commit is contained in:
jonschz 2025-01-25 20:07:35 +01:00
parent b649cf7ced
commit e143dce330
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/include/infocenter.h
View File

@ -40,7 +40,10 @@ class InfocenterState : public LegoState {
MxS16 GetMaxNameLength() { return sizeOfArray(m_letters); } MxS16 GetMaxNameLength() { return sizeOfArray(m_letters); }
MxStillPresenter* GetNameLetter(MxS32 p_index) { return m_letters[p_index]; } MxStillPresenter* GetNameLetter(MxS32 p_index) { return m_letters[p_index]; }
void SetNameLetter(MxS32 p_index, MxStillPresenter* p_letter) { m_letters[p_index] = p_letter; } void SetNameLetter(MxS32 p_index, MxStillPresenter* p_letter) { m_letters[p_index] = p_letter; }
// FUNCTION: BETA10 0x10031bd0
MxBool HasRegistered() { return m_letters[0] != NULL; } MxBool HasRegistered() { return m_letters[0] != NULL; }
Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; } Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; }
Playlist& GetExitDialogueAct23() { return m_exitDialogueAct23; } Playlist& GetExitDialogueAct23() { return m_exitDialogueAct23; }
Playlist& GetReturnDialogue(LegoGameState::Act p_act) { return m_returnDialogue[p_act]; } Playlist& GetReturnDialogue(LegoGameState::Act p_act) { return m_returnDialogue[p_act]; }
@ -50,9 +53,6 @@ class InfocenterState : public LegoState {
void SetUnknown0x74(MxU32 p_unk0x74) { m_unk0x74 = p_unk0x74; } void SetUnknown0x74(MxU32 p_unk0x74) { m_unk0x74 = p_unk0x74; }
// FUNCTION: BETA10 0x10031bd0
MxBool FirstLetterIsNotNull() { return m_letters[0] != NULL; }
// SYNTHETIC: LEGO1 0x10071900 // SYNTHETIC: LEGO1 0x10071900
// InfocenterState::`scalar deleting destructor' // InfocenterState::`scalar deleting destructor'

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

@ -454,13 +454,16 @@ void RegistrationBook::ReadyWorld()
} }
} }
// TODO: Remove this one if the function mismatches again
(void)0;
#ifdef BETA10 #ifdef BETA10
InfocenterState* infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState"); InfocenterState* infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState");
assert(infocenterState); assert(infocenterState);
if (infocenterState->FirstLetterIsNotNull()) if (infocenterState->HasRegistered())
#else #else
if (m_infocenterState->FirstLetterIsNotNull()) if (m_infocenterState->HasRegistered())
#endif #endif
{ {
PlayAction(RegbookScript::c_iic008in_PlayWav); PlayAction(RegbookScript::c_iic008in_PlayWav);