variable number match on BETA10, 91 % on LEGO1

This commit is contained in:
jonschz 2025-01-24 13:58:49 +01:00
parent aaee45e0fd
commit df37b5014d
2 changed files with 10 additions and 14 deletions

View File

@ -164,7 +164,7 @@ class LegoGameState {
MxS16 GetCount() { return m_count; } MxS16 GetCount() { return m_count; }
// TODO: Not yet correct // TODO: Not yet correct
// FUNCTION: BETA10 0x1002c54 // FUNCTION: BETA10 0x1002c540
ScoreItem* GetScore(MxS32 p_index) { return p_index >= m_count ? NULL : &m_scores[p_index]; } ScoreItem* GetScore(MxS32 p_index) { return p_index >= m_count ? NULL : &m_scores[p_index]; }
MxS16 m_count; // 0x00 MxS16 m_count; // 0x00

View File

@ -93,9 +93,10 @@ MxLong HistoryBook::Notify(MxParam& p_param)
// FUNCTION: BETA10 0x1002b9b9 // FUNCTION: BETA10 0x1002b9b9
void HistoryBook::ReadyWorld() void HistoryBook::ReadyWorld()
{ {
undefined2 dummy1 = 0x90, dummy2 = 0x79, dummy3 = 0xc8;//, dummy4 = 0x17, dummy5 = 0x1b; undefined2 dummy1 = 0x90, dummy2 = 0x79, dummy3 = 0xc8, dummy4 = 0x17, dummy5 = 0x1b;
#ifndef BETA10
LegoWorld::ReadyWorld(); LegoWorld::ReadyWorld();
#endif
GameState()->m_history.WriteScoreHistory(); GameState()->m_history.WriteScoreHistory();
char bitmap[] = "A_Bitmap"; char bitmap[] = "A_Bitmap";
@ -152,17 +153,12 @@ void HistoryBook::ReadyWorld()
m_scores[i]->Enable(TRUE); m_scores[i]->Enable(TRUE);
m_scores[i]->SetTickleState(MxPresenter::e_repeating); m_scores[i]->SetTickleState(MxPresenter::e_repeating);
m_scores[i]->SetPosition(scoreX + 0xa1, scoreY); m_scores[i]->SetPosition(scoreX + 0xa1, scoreY);
#ifdef BETA10
for (MxS16 letterIndex = 0; letterIndex < (MxS16) sizeOfArray(m_name[0]); letterIndex++, scoreX += 0x17) { for (MxS16 j = 0; score->m_name.m_letters[j] != -1; j++, scoreX += 0x17) {
MxS16 letter = score->m_name.m_letters[letterIndex]; #else
for (MxS16 j = 0; j < (MxS16) sizeOfArray(m_name[0]) && score->m_name.m_letters[j] != -1; j++, scoreX += 0x17) {
if (letter == -1) { #endif
break; m_name[i][j] = m_alphabet[score->m_name.m_letters[j]]->Clone();
}
MxS16 j = letterIndex++;
m_name[i][j] = m_alphabet[letter]->Clone();
assert(m_name[i][j]); assert(m_name[i][j]);
m_name[i][j]->Enable(TRUE); m_name[i][j]->Enable(TRUE);