diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h index 2e71db5a..f6e1bb2f 100644 --- a/LEGO1/lego/legoomni/include/legogamestate.h +++ b/LEGO1/lego/legoomni/include/legogamestate.h @@ -208,7 +208,6 @@ class LegoGameState { Act GetLoadedAct() { return m_loadedAct; } Area GetPreviousArea() { return m_previousArea; } Area GetUnknown0x42c() { return m_unk0x42c; } - History* GetHistory() { return &m_history; } void SetDirty(MxBool p_isDirty) { m_isDirty = p_isDirty; } void SetPreviousArea(Area p_previousArea) { m_previousArea = p_previousArea; } diff --git a/LEGO1/lego/legoomni/src/worlds/historybook.cpp b/LEGO1/lego/legoomni/src/worlds/historybook.cpp index cbb6ccc4..a547cb93 100644 --- a/LEGO1/lego/legoomni/src/worlds/historybook.cpp +++ b/LEGO1/lego/legoomni/src/worlds/historybook.cpp @@ -107,9 +107,10 @@ inline void SetColor(MxStillPresenter* p_presenter, MxU8 p_color, MxU8* p_colors // FUNCTION: BETA10 0x1002b9b9 void HistoryBook::ReadyWorld() { + undefined4 dummy; + LegoWorld::ReadyWorld(); - // TODO: No GetHistory() in between for BETA10 - check order / alignment for WriteScoreHistory - GameState()->GetHistory()->WriteScoreHistory(); + GameState()->m_history.WriteScoreHistory(); char bitmap[] = "A_Bitmap"; MxS16 i = 0; @@ -125,8 +126,8 @@ void HistoryBook::ReadyWorld() {0x76, 0x4c, 0x38}; // yellow - #FFB900, blue - #00548C, red - #CB1220, background - #CECECE, border - #74818B MxS32 scoreY = 0x79; - for (i = 0; i < GameState()->GetHistory()->GetCount(); i++) { - LegoGameState::ScoreItem* score = GameState()->GetHistory()->GetScore(i); + for (i = 0; i < GameState()->m_history.GetCount(); i++) { + LegoGameState::ScoreItem* score = GameState()->m_history.GetScore(i); MxStillPresenter** scorebox = &m_scores[i]; *scorebox = scoreboxMaster->Clone(); diff --git a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp index 5ade0b3a..0e081133 100644 --- a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp +++ b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp @@ -391,7 +391,7 @@ void RegistrationBook::FUN_100778c0() void RegistrationBook::ReadyWorld() { LegoGameState* gameState = GameState(); - gameState->GetHistory()->WriteScoreHistory(); + gameState->m_history.WriteScoreHistory(); MxS16 i; PlayMusic(JukeboxScript::c_InformationCenter_Music);