From 2a92a02f5f0e4ebfd930bde0bba2cac06d4f8217 Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Fri, 20 Jun 2025 16:31:43 -0700 Subject: [PATCH] Fix merge --- LEGO1/lego/legoomni/src/actors/radio.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/LEGO1/lego/legoomni/src/actors/radio.cpp b/LEGO1/lego/legoomni/src/actors/radio.cpp index a29c42a6..2df84506 100644 --- a/LEGO1/lego/legoomni/src/actors/radio.cpp +++ b/LEGO1/lego/legoomni/src/actors/radio.cpp @@ -215,16 +215,16 @@ RadioState::RadioState() { srand(Timer()->GetTime()); - m_unk0x2c = SDL_rand(3); + m_activePlaylist = SDL_rand(3); - m_unk0x08[0] = Playlist((MxU32*) g_jingles, sizeOfArray(g_jingles), Playlist::e_loop); - m_unk0x08[0].m_nextIndex = SDL_rand(sizeOfArray(g_jingles)); + m_playlists[0] = Playlist((MxU32*) g_jingles, sizeOfArray(g_jingles), Playlist::e_loop); + m_playlists[0].m_nextIndex = SDL_rand(sizeOfArray(g_jingles)); - m_unk0x08[1] = Playlist((MxU32*) g_news, sizeOfArray(g_news), Playlist::e_loop); - m_unk0x08[1].m_nextIndex = SDL_rand(sizeOfArray(g_news)); + m_playlists[1] = Playlist((MxU32*) g_news, sizeOfArray(g_news), Playlist::e_loop); + m_playlists[1].m_nextIndex = SDL_rand(sizeOfArray(g_news)); - m_unk0x08[2] = Playlist((MxU32*) g_songs, sizeOfArray(g_songs), Playlist::e_loop); - m_unk0x08[2].m_nextIndex = SDL_rand(sizeOfArray(g_songs)); + m_playlists[2] = Playlist((MxU32*) g_songs, sizeOfArray(g_songs), Playlist::e_loop); + m_playlists[2].m_nextIndex = SDL_rand(sizeOfArray(g_songs)); m_active = FALSE; }