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

Refactor getter

Browse Source
This commit is contained in:
jonschz 2025-01-24 11:06:48 +01:00
parent cc6423603e
commit e548f9e44a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LEGO1/lego/legoomni/include/legogamestate.h
View File

@ -208,7 +208,6 @@ class LegoGameState {
Act GetLoadedAct() { return m_loadedAct; } Act GetLoadedAct() { return m_loadedAct; }
Area GetPreviousArea() { return m_previousArea; } Area GetPreviousArea() { return m_previousArea; }
Area GetUnknown0x42c() { return m_unk0x42c; } Area GetUnknown0x42c() { return m_unk0x42c; }
History* GetHistory() { return &m_history; }
void SetDirty(MxBool p_isDirty) { m_isDirty = p_isDirty; } void SetDirty(MxBool p_isDirty) { m_isDirty = p_isDirty; }
void SetPreviousArea(Area p_previousArea) { m_previousArea = p_previousArea; } void SetPreviousArea(Area p_previousArea) { m_previousArea = p_previousArea; }

9
LEGO1/lego/legoomni/src/worlds/historybook.cpp
View File

@ -107,9 +107,10 @@ inline void SetColor(MxStillPresenter* p_presenter, MxU8 p_color, MxU8* p_colors
// FUNCTION: BETA10 0x1002b9b9 // FUNCTION: BETA10 0x1002b9b9
void HistoryBook::ReadyWorld() void HistoryBook::ReadyWorld()
{ {
undefined4 dummy;
LegoWorld::ReadyWorld(); LegoWorld::ReadyWorld();
// TODO: No GetHistory() in between for BETA10 - check order / alignment for WriteScoreHistory GameState()->m_history.WriteScoreHistory();
GameState()->GetHistory()->WriteScoreHistory();
char bitmap[] = "A_Bitmap"; char bitmap[] = "A_Bitmap";
MxS16 i = 0; MxS16 i = 0;
@ -125,8 +126,8 @@ void HistoryBook::ReadyWorld()
{0x76, 0x4c, 0x38}; // yellow - #FFB900, blue - #00548C, red - #CB1220, background - #CECECE, border - #74818B {0x76, 0x4c, 0x38}; // yellow - #FFB900, blue - #00548C, red - #CB1220, background - #CECECE, border - #74818B
MxS32 scoreY = 0x79; MxS32 scoreY = 0x79;
for (i = 0; i < GameState()->GetHistory()->GetCount(); i++) { for (i = 0; i < GameState()->m_history.GetCount(); i++) {
LegoGameState::ScoreItem* score = GameState()->GetHistory()->GetScore(i); LegoGameState::ScoreItem* score = GameState()->m_history.GetScore(i);
MxStillPresenter** scorebox = &m_scores[i]; MxStillPresenter** scorebox = &m_scores[i];
*scorebox = scoreboxMaster->Clone(); *scorebox = scoreboxMaster->Clone();

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

@ -391,7 +391,7 @@ void RegistrationBook::FUN_100778c0()
void RegistrationBook::ReadyWorld() void RegistrationBook::ReadyWorld()
{ {
LegoGameState* gameState = GameState(); LegoGameState* gameState = GameState();
gameState->GetHistory()->WriteScoreHistory(); gameState->m_history.WriteScoreHistory();
MxS16 i; MxS16 i;
PlayMusic(JukeboxScript::c_InformationCenter_Music); PlayMusic(JukeboxScript::c_InformationCenter_Music);