mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-01-11 18:41:14 +00:00
Fix merge
This commit is contained in:
parent
a336a817a2
commit
2a92a02f5f
@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user