From f5834db6f72e25d195362bad5d86d822f239f5c3 Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Mon, 5 Apr 2010 13:48:23 +0000
Subject: [PATCH] Actually fix endgame music, make briefing beep only play when
 flashing_cursor is on, no restarting music when reloading a saved game

---
 CHANGELOG.txt  | 1 +
 main/gameseq.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 56f0c37b4..96da3a5da 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20100405
 --------
 arch/include/digi_audio.h, arch/include/digi_mixer.h, arch/include/digi_mixer_music.h, arch/linux/hmiplay.c, arch/linux/hmistub.c, arch/sdl/digi.c, arch/sdl/digi_audio.c, arch/sdl/digi_mixer.c, arch/sdl/digi_mixer_music.c, arch/sdl/jukebox.c, arch/sdl/rbaudio.c, main/digi.h, main/gamecntl.c, main/songs.c, main/songs.h, main/titles.c: Actually play endgame music when game is finished
+main/gameseq.c: No restarting music when reloading a saved game
 
 20100404
 --------
diff --git a/main/gameseq.c b/main/gameseq.c
index 32c595b98..581505a76 100644
--- a/main/gameseq.c
+++ b/main/gameseq.c
@@ -703,7 +703,8 @@ void LoadLevel(int level_num)
 
 	set_sound_sources();
 
-	songs_play_level_song( Current_level_num );
+	if (songs_is_playing() < SONG_FIRST_LEVEL_SONG)
+		songs_play_level_song( Current_level_num );
 
 	gr_palette_load(gr_palette);		//actually load the palette
 }