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

Improve match

Browse Source
This commit is contained in:
jonschz 2025-01-25 11:45:28 +01:00
parent 382f058c23
commit b092eafc1b
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LEGO1/lego/legoomni/include/legomain.h
View File

@ -168,7 +168,9 @@ class LegoOmni : public MxOmni {
// FUNCTION: BETA10 0x100e52b0 // FUNCTION: BETA10 0x100e52b0
LegoGameState* GetGameState() { return m_gameState; } LegoGameState* GetGameState() { return m_gameState; }
// FUNCTION: BETA10 0x100e5280
MxBackgroundAudioManager* GetBackgroundAudioManager() { return m_bkgAudioManager; } MxBackgroundAudioManager* GetBackgroundAudioManager() { return m_bkgAudioManager; }
MxTransitionManager* GetTransitionManager() { return m_transitionManager; } MxTransitionManager* GetTransitionManager() { return m_transitionManager; }
MxDSAction& GetCurrentAction() { return m_action; } MxDSAction& GetCurrentAction() { return m_action; }
LegoCharacterManager* GetCharacterManager() { return m_characterManager; } LegoCharacterManager* GetCharacterManager() { return m_characterManager; }

3
LEGO1/lego/legoomni/src/common/misc.cpp
View File

@ -212,8 +212,11 @@ MxTransitionManager* TransitionManager()
} }
// FUNCTION: LEGO1 0x10015910 // FUNCTION: LEGO1 0x10015910
// FUNCTION: BETA10 0x100e4f4c
void PlayMusic(JukeboxScript::Script p_objectId) void PlayMusic(JukeboxScript::Script p_objectId)
{ {
assert(LegoOmni::GetInstance());
MxDSAction action; MxDSAction action;
action.SetAtomId(*g_jukeboxScript); action.SetAtomId(*g_jukeboxScript);
action.SetObjectId(p_objectId); action.SetObjectId(p_objectId);

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

@ -103,6 +103,8 @@ void HistoryBook::ReadyWorld()
MxS16 i; MxS16 i;
for (i = 0; i < 26; i++) { for (i = 0; i < 26; i++) {
// TODO: This might be an inline function.
// See also `RegistrationBook::ReadyWorld()`.
if (i < 26) { if (i < 26) {
m_alphabet[i] = (MxStillPresenter*) Find("MxStillPresenter", bitmap); m_alphabet[i] = (MxStillPresenter*) Find("MxStillPresenter", bitmap);
assert(m_alphabet[i]); assert(m_alphabet[i]);

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

@ -388,6 +388,7 @@ void RegistrationBook::FUN_100778c0()
} }
// FUNCTION: LEGO1 0x10077cc0 // FUNCTION: LEGO1 0x10077cc0
// FUNCTION: BETA10 0x100f3671
void RegistrationBook::ReadyWorld() void RegistrationBook::ReadyWorld()
{ {
LegoGameState* gameState = GameState(); LegoGameState* gameState = GameState();
@ -399,9 +400,11 @@ void RegistrationBook::ReadyWorld()
MxS16 i; MxS16 i;
for (i = 0; i < 26; i++) { for (i = 0; i < 26; i++) {
// TODO: This might be an inline function.
// See also `HistoryBook::ReadyWorld()`.
if (i < 26) { if (i < 26) {
m_alphabet[i] = (MxStillPresenter*) Find("MxStillPresenter", letterBuffer); m_alphabet[i] = (MxStillPresenter*) Find("MxStillPresenter", letterBuffer);
assert(m_alphabet[i]);
// We need to loop through the entire alphabet, // We need to loop through the entire alphabet,
// so increment the first char of the bitmap name // so increment the first char of the bitmap name
letterBuffer[0]++; letterBuffer[0]++;
@ -412,7 +415,7 @@ void RegistrationBook::ReadyWorld()
char checkmarkBuffer[] = "Check0_Ctl"; char checkmarkBuffer[] = "Check0_Ctl";
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
m_checkmark[i] = (MxControlPresenter*) Find("MxControlPresenter", checkmarkBuffer); m_checkmark[i] = (MxControlPresenter*) Find("MxControlPresenter", checkmarkBuffer);
assert(m_checkmark[i]);
// Just like in the prior letter loop, // Just like in the prior letter loop,
// we need to increment the fifth char // we need to increment the fifth char
// to get the next checkmark bitmap // to get the next checkmark bitmap
@ -431,6 +434,7 @@ void RegistrationBook::ReadyWorld()
// Start building the player names using a two-dimensional array // Start building the player names using a two-dimensional array
m_name[i][j] = m_alphabet[players[i - 1].m_letters[j]]->Clone(); m_name[i][j] = m_alphabet[players[i - 1].m_letters[j]]->Clone();
assert(m_name[i][j]);
// Enable the presenter to actually show the letter in the grid // Enable the presenter to actually show the letter in the grid
m_name[i][j]->Enable(TRUE); m_name[i][j]->Enable(TRUE);