From df37b5014deca7438598ad00b7902497385d8195 Mon Sep 17 00:00:00 2001
From: jonschz <jonschz@users.noreply.github.com>
Date: Fri, 24 Jan 2025 13:58:49 +0100
Subject: [PATCH] variable number match on BETA10, 91 % on LEGO1

---
 LEGO1/lego/legoomni/include/legogamestate.h   |  2 +-
 .../lego/legoomni/src/worlds/historybook.cpp  | 22 ++++++++-----------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/LEGO1/lego/legoomni/include/legogamestate.h b/LEGO1/lego/legoomni/include/legogamestate.h
index f6e1bb2fa9..291e58d045 100644
--- a/LEGO1/lego/legoomni/include/legogamestate.h
+++ b/LEGO1/lego/legoomni/include/legogamestate.h
@@ -164,7 +164,7 @@ class LegoGameState {
 		MxS16 GetCount() { return m_count; }
 
 		// 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]; }
 
 		MxS16 m_count;          // 0x00
diff --git a/LEGO1/lego/legoomni/src/worlds/historybook.cpp b/LEGO1/lego/legoomni/src/worlds/historybook.cpp
index d5743276d1..02bb542112 100644
--- a/LEGO1/lego/legoomni/src/worlds/historybook.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/historybook.cpp
@@ -93,9 +93,10 @@ MxLong HistoryBook::Notify(MxParam& p_param)
 // FUNCTION: BETA10 0x1002b9b9
 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();
+#endif
 	GameState()->m_history.WriteScoreHistory();
 
 	char bitmap[] = "A_Bitmap";
@@ -152,17 +153,12 @@ void HistoryBook::ReadyWorld()
 		m_scores[i]->Enable(TRUE);
 		m_scores[i]->SetTickleState(MxPresenter::e_repeating);
 		m_scores[i]->SetPosition(scoreX + 0xa1, scoreY);
-
-		for (MxS16 letterIndex = 0; letterIndex < (MxS16) sizeOfArray(m_name[0]); letterIndex++, scoreX += 0x17) {
-			MxS16 letter = score->m_name.m_letters[letterIndex];
-
-			if (letter == -1) {
-				break;
-			}
-
-			MxS16 j = letterIndex++;
-
-			m_name[i][j] = m_alphabet[letter]->Clone();
+#ifdef BETA10
+		for (MxS16 j = 0; score->m_name.m_letters[j] != -1; j++, scoreX += 0x17) {
+#else
+		for (MxS16 j = 0; j < (MxS16) sizeOfArray(m_name[0]) && score->m_name.m_letters[j] != -1; j++, scoreX += 0x17) {
+#endif
+			m_name[i][j] = m_alphabet[score->m_name.m_letters[j]]->Clone();
 
 			assert(m_name[i][j]);
 			m_name[i][j]->Enable(TRUE);