From d40d9b7f0d2145b231538227b08ba20d8ba890a7 Mon Sep 17 00:00:00 2001
From: Joost Peters
Date: Sat, 24 Jan 2004 22:55:09 +0000
Subject: - Added MT32 -> GM mapping, this fixes the wrong sound for the clock
 in the beginning as well as various tunes. - Don't try to play invalid music
 (list probably is incomplete) - Work around annoying notes bug in 2 pieces of
 Floda music - Stop music when loading savegames

svn-id: r12584
---
 queen/journal.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'queen/journal.cpp')

diff --git a/queen/journal.cpp b/queen/journal.cpp
index c4400e08b3..88f70f3cb8 100644
--- a/queen/journal.cpp
+++ b/queen/journal.cpp
@@ -27,6 +27,7 @@
 #include "queen/graphics.h"
 #include "queen/grid.h"
 #include "queen/logic.h"
+#include "queen/music.h"
 #include "queen/queen.h"
 #include "queen/resource.h"
 #include "queen/sound.h"
@@ -284,6 +285,7 @@ void Journal::handleYesNoMode(int16 zoneNum) {
 			if (_saveDescriptions[currentSlot][0]) {
 				_vm->graphics()->clearBobs();
 				_vm->display()->palFadeOut(0, 223, JOURNAL_ROOM);
+				_vm->music()->stopSong();
 				_vm->loadGameState(currentSlot);
 				_vm->display()->clearTexts(0, GAME_SCREEN_HEIGHT - 1);
 				// XXX panelflag=1;
-- 
cgit v1.2.3