Fix merge

This commit is contained in:
Christian Semmler 2025-06-20 16:31:43 -07:00
parent a336a817a2
commit 2a92a02f5f
No known key found for this signature in database
GPG Key ID: 086DAA1360BEEE5C

View File

@ -215,16 +215,16 @@ RadioState::RadioState()
{ {
srand(Timer()->GetTime()); 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_playlists[0] = Playlist((MxU32*) g_jingles, sizeOfArray(g_jingles), Playlist::e_loop);
m_unk0x08[0].m_nextIndex = SDL_rand(sizeOfArray(g_jingles)); m_playlists[0].m_nextIndex = SDL_rand(sizeOfArray(g_jingles));
m_unk0x08[1] = Playlist((MxU32*) g_news, sizeOfArray(g_news), Playlist::e_loop); m_playlists[1] = Playlist((MxU32*) g_news, sizeOfArray(g_news), Playlist::e_loop);
m_unk0x08[1].m_nextIndex = SDL_rand(sizeOfArray(g_news)); m_playlists[1].m_nextIndex = SDL_rand(sizeOfArray(g_news));
m_unk0x08[2] = Playlist((MxU32*) g_songs, sizeOfArray(g_songs), Playlist::e_loop); m_playlists[2] = Playlist((MxU32*) g_songs, sizeOfArray(g_songs), Playlist::e_loop);
m_unk0x08[2].m_nextIndex = SDL_rand(sizeOfArray(g_songs)); m_playlists[2].m_nextIndex = SDL_rand(sizeOfArray(g_songs));
m_active = FALSE; m_active = FALSE;
} }