From cf9d6567c7f09beffb624beaf25b208094fe528b Mon Sep 17 00:00:00 2001 From: Ramen2X Date: Fri, 15 Mar 2024 15:34:01 -0400 Subject: [PATCH] fix legogamestate structure, documentation tweaks --- LEGO1/lego/legoomni/include/legogamestate.h | 5 ++++- LEGO1/lego/legoomni/src/worlds/registrationbook.cpp | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h index 4d9085fe..0d1357f7 100644 --- a/LEGO1/lego/legoomni/include/legogamestate.h +++ b/LEGO1/lego/legoomni/include/legogamestate.h @@ -168,7 +168,7 @@ class LegoGameState { void SetCurrentAct(Act p_currentAct); void FindLoadedAct(); -public: +private: void RegisterState(LegoState* p_state); MxResult WriteVariable(LegoStorage* p_storage, MxVariableTable* p_from, const char* p_variableName); MxResult WriteEndOfVariables(LegoStorage* p_storage); @@ -187,7 +187,10 @@ class LegoGameState { LegoFullScreenMovie* m_fullScreenMovie; // 0x20 MxU16 m_unk0x24; // 0x24 MxS16 m_playerCount; // 0x26 +public: + // This member is accessed directly by foreign classes Username m_players[9]; // 0x28 +private: History m_history; // 0xa6 undefined2 m_unk0x41a; // 0x41a undefined4 m_unk0x41c; // 0x41c diff --git a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp index a15c28a6..018d05e4 100644 --- a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp +++ b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp @@ -153,14 +153,14 @@ void RegistrationBook::ReadyWorld() m_checkmark[i]->Enable(TRUE); } - // Start building the player name using a two-dimensional array + // Start building the player names using a two-dimensional array m_name[i][j] = m_alphabet[gameState->m_players[i].m_letters[j]]->Clone(); - // Enable the presenter to actually show the letter + // Enable the presenter to actually show the letter in the grid m_name[i][j]->Enable(TRUE); m_name[i][j]->SetTickleState(MxPresenter::e_repeating); - m_name[i][j]->SetPosition((23 * j + 343), 27 * i + 121); + m_name[i][j]->SetPosition(23 * j + 343, 27 * i + 121); } } }