Match RegistrationBook::ReadyWorld (#1375)

isledecomp · Jan 24, 2025 · 382f058 · 382f058
1 parent 82f2e2e
commit 382f058
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp b/LEGO1/lego/legoomni/src/worlds/registrationbook.cpp
@@ -392,17 +392,20 @@ void RegistrationBook::ReadyWorld()
 {
 	LegoGameState* gameState = GameState();
 	gameState->m_history.WriteScoreHistory();
-	MxS16 i;
 
 	PlayMusic(JukeboxScript::c_InformationCenter_Music);
 
 	char letterBuffer[] = "A_Bitmap";
+	MxS16 i;
+
 	for (i = 0; i < 26; i++) {
-		m_alphabet[i] = (MxStillPresenter*) Find("MxStillPresenter", letterBuffer);
+		if (i < 26) {
+			m_alphabet[i] = (MxStillPresenter*) Find("MxStillPresenter", letterBuffer);
 
-		// We need to loop through the entire alphabet,
-		// so increment the first char of the bitmap name
-		letterBuffer[0]++;
+			// We need to loop through the entire alphabet,
+			// so increment the first char of the bitmap name
+			letterBuffer[0]++;
+		}
 	}
 
 	// Now we have to do the checkmarks
@@ -437,7 +440,7 @@ void RegistrationBook::ReadyWorld()
 		}
 	}
 
-	if (m_infocenterState->HasRegistered()) {
+	if (m_infocenterState->m_letters[0] != NULL) {
 		PlayAction(RegbookScript::c_iic008in_PlayWav);
 
 		LegoROI* infoman = FindROI(g_infoman);