diff --git a/LEGO1/lego/legoomni/include/infocenter.h b/LEGO1/lego/legoomni/include/infocenter.h index d54540dd..f4c86a67 100644 --- a/LEGO1/lego/legoomni/include/infocenter.h +++ b/LEGO1/lego/legoomni/include/infocenter.h @@ -40,7 +40,10 @@ class InfocenterState : public LegoState { MxS16 GetMaxNameLength() { return sizeOfArray(m_letters); } MxStillPresenter* GetNameLetter(MxS32 p_index) { return m_letters[p_index]; } void SetNameLetter(MxS32 p_index, MxStillPresenter* p_letter) { m_letters[p_index] = p_letter; } + + // FUNCTION: BETA10 0x10031bd0 MxBool HasRegistered() { return m_letters[0] != NULL; } + Playlist& GetExitDialogueAct1() { return m_exitDialogueAct1; } Playlist& GetExitDialogueAct23() { return m_exitDialogueAct23; } 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; } - // FUNCTION: BETA10 0x10031bd0 - MxBool FirstLetterIsNotNull() { return m_letters[0] != NULL; } - // SYNTHETIC: LEGO1 0x10071900 // InfocenterState::`scalar deleting destructor' diff --git a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp index 0b3d2458..5512c868 100644 --- a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp +++ b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp @@ -454,13 +454,16 @@ void RegistrationBook::ReadyWorld() } } + // TODO: Remove this one if the function mismatches again + (void)0; + #ifdef BETA10 InfocenterState* infocenterState = (InfocenterState*) GameState()->GetState("InfocenterState"); assert(infocenterState); - if (infocenterState->FirstLetterIsNotNull()) + if (infocenterState->HasRegistered()) #else - if (m_infocenterState->FirstLetterIsNotNull()) + if (m_infocenterState->HasRegistered()) #endif { PlayAction(RegbookScript::c_iic008in_PlayWav);