Mercurial > hg > openttd

changeset 7744:413804f41045 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r11281) -Revert(r11259): the problem was not there. In fact, it made it so that no more music were allowed on intro. -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 :)
author belugas <belugas@openttd.org>
date Wed, 17 Oct 2007 01:33:21 +0000
parents d0af601fef9d
children 61529e596a0a
files src/music_gui.cpp
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -118,7 +118,8 @@
 		}
 	} 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;
 		do {
 			uint32 r = InteractiveRandom();
@@ -174,11 +175,7 @@
 	if (!msf.playing && _song_is_active) {
 		StopMusic();
 	} else if (msf.playing && !_song_is_active) {
-		if (_game_mode != GM_MENU) {
-			PlayPlaylistSong();
-		} else {
-			ResetMusic();
-		}
+		PlayPlaylistSong();
 	}
 
 	if (!_song_is_active) return;