From a607d2248f32a62e5eb4688eb9854b5173d59058 Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Sun, 21 Nov 2004 16:15:58 +0000
Subject: But surely we should still call setGM(true) in the GM case, right...?

svn-id: r15854
---
 saga/music.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'saga')

diff --git a/saga/music.cpp b/saga/music.cpp
index d731667142..73e23a36bd 100644
--- a/saga/music.cpp
+++ b/saga/music.cpp
@@ -463,8 +463,13 @@ int Music::play(uint32 music_rn, uint16 flags) {
 
 			if (hasAdlib()) {
 				rsc_ctxt = GAME_GetFileContext(GAME_MUSICFILE_FM, 0);
+				// FIXME: This is weird, but this way Adlib
+				// sounds closer to original, though instrument
+				// mapping is not correct.
+				_player->setGM(false);
 			} else {
 				rsc_ctxt = GAME_GetFileContext(GAME_MUSICFILE_GM, 0);
+				_player->setGM(true);
 			}
 		}
 
@@ -474,12 +479,6 @@ int Music::play(uint32 music_rn, uint16 flags) {
 			return FAILURE;
 		}
 
-		// FIXME: This is weird, but this way Adlib sounds closer to original, 
-		// though instrument mapping is not correct
-		if (hasAdlib()) {
-			_player->setGM(false);
-		}
-
 		parser = MidiParser::createParser_XMIDI();
 	}
 
-- 
cgit v1.2.3