From 096487b2cba21bd84addd349c87cb983d7b57d1c Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Mon, 19 Feb 2024 09:18:59 -0500 Subject: [PATCH] Rename --- LEGO1/lego/legoomni/include/legogamestate.h | 8 ++++---- LEGO1/lego/legoomni/src/common/legogamestate.cpp | 2 +- LEGO1/lego/legoomni/src/isle/historybook.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h index 999a6433..f893f154 100644 --- a/LEGO1/lego/legoomni/include/legogamestate.h +++ b/LEGO1/lego/legoomni/include/legogamestate.h @@ -94,7 +94,7 @@ class LegoGameState { }; // SIZE 0x2c - struct Score { + struct ScoreItem { undefined2 m_unk0x00; // 0x00 MxU8 m_state[25]; // 0x02 ScoreName m_name; // 0x1c @@ -106,10 +106,10 @@ class LegoGameState { void WriteScoreHistory(); void FUN_1003ccf0(LegoFile&); - inline Score* GetScore(MxS16 p_index) { return p_index >= m_count ? NULL : &m_scores[p_index]; } + inline ScoreItem* GetScore(MxS16 p_index) { return p_index >= m_count ? NULL : &m_scores[p_index]; } - MxS16 m_count; // 0x00 - Score m_scores[20]; // 0x02 + MxS16 m_count; // 0x00 + ScoreItem m_scores[20]; // 0x02 }; LegoGameState(); diff --git a/LEGO1/lego/legoomni/src/common/legogamestate.cpp b/LEGO1/lego/legoomni/src/common/legogamestate.cpp index a49fc016..9d81f699 100644 --- a/LEGO1/lego/legoomni/src/common/legogamestate.cpp +++ b/LEGO1/lego/legoomni/src/common/legogamestate.cpp @@ -16,7 +16,7 @@ #include DECOMP_SIZE_ASSERT(LegoGameState::ScoreName, 0xe) -DECOMP_SIZE_ASSERT(LegoGameState::Score, 0x2c) +DECOMP_SIZE_ASSERT(LegoGameState::ScoreItem, 0x2c) DECOMP_SIZE_ASSERT(LegoGameState::Scores, 0x372) DECOMP_SIZE_ASSERT(LegoGameState, 0x430) diff --git a/LEGO1/lego/legoomni/src/isle/historybook.cpp b/LEGO1/lego/legoomni/src/isle/historybook.cpp index 7db23ff7..41a49aed 100644 --- a/LEGO1/lego/legoomni/src/isle/historybook.cpp +++ b/LEGO1/lego/legoomni/src/isle/historybook.cpp @@ -94,7 +94,7 @@ void HistoryBook::ReadyWorld() MxS32 scoreY = 0x79; for (MxS16 scoreIndex = 0; scoreIndex < GameState()->GetScores()->m_count; scoreIndex++) { - LegoGameState::Score* score = GameState()->GetScores()->GetScore(scoreIndex); + LegoGameState::ScoreItem* score = GameState()->GetScores()->GetScore(scoreIndex); MxStillPresenter** scorebox = &m_scores[scoreIndex]; *scorebox = scoreboxMaster->Clone();