Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r11281) -Revert(r11259): the problem was not there. In fact, it made it so that no more music were allowed on intro.

Browse Source 
-Fix[FS#1331]: Somehow, the notion that the first song must be the ttd theme has been lost while on the intro window.
When using shuffling setting (which was saved), the intro song at startup was shuffled too.  No more :)
This commit is contained in:
belugas 2007-10-17 01:33:21 +00:00
parent 04c09b9bf2
commit 9804808fe4
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/music_gui.cpp
View File

@ -118,7 +118,8 @@ static void SelectSongToPlay()
} }
} while (_playlists[msf.playlist][i++] != 0 && i < lengthof(_cur_playlist) - 1); } while (_playlists[msf.playlist][i++] != 0 && i < lengthof(_cur_playlist) - 1);
if (msf.shuffle) { /* Do not shuffle when on the intro-start window, as the song to play has to be the original TTD Theme*/
if (msf.shuffle && _game_mode != GM_MENU) {
i = 500; i = 500;
do { do {
uint32 r = InteractiveRandom(); uint32 r = InteractiveRandom();
@ -174,11 +175,7 @@ void MusicLoop()
if (!msf.playing && _song_is_active) { if (!msf.playing && _song_is_active) {
StopMusic(); StopMusic();
} else if (msf.playing && !_song_is_active) { } else if (msf.playing && !_song_is_active) {
if (_game_mode != GM_MENU) {
PlayPlaylistSong(); PlayPlaylistSong();
} else {
ResetMusic();
}
} }
if (!_song_is_active) return; if (!_song_is_active) return;