From 92f5e206bd0c4d668d3a6187efb26a75ec99e81b Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Thu, 6 Oct 2005 15:54:43 +0000
Subject: Disabled scene background music for IHNM, for now. It was trying to
 start the end credits music right after the intro.

svn-id: r18950
---
 saga/scene.cpp | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

(limited to 'saga/scene.cpp')

diff --git a/saga/scene.cpp b/saga/scene.cpp
index dd58ba67cb..ac40c69348 100644
--- a/saga/scene.cpp
+++ b/saga/scene.cpp
@@ -799,7 +799,6 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) {
 		q_event = _vm->_events->chain(q_event, &event);
 	}
 
-
 	if (loadSceneParams->sceneProc == NULL) {
 		if (!_inGame) {
 			_inGame = true;
@@ -808,22 +807,29 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) {
 
 		_vm->_sound->stopAll();
 
-		if (_sceneDescription.musicResourceId >= 0) {
-			event.type = kEvTOneshot;
-			event.code = kMusicEvent;
-			event.param = _sceneDescription.musicResourceId;
-			event.param2 = MUSIC_DEFAULT;
-			event.op = kEventPlay;
-			event.time = 0;
-
-			_vm->_events->queue(&event);
-		} else {
-			event.type = kEvTOneshot;
-			event.code = kMusicEvent;
-			event.op = kEventStop;
-			event.time = 0;
+		// FIXME: Does IHNM use scene background music, or is all the
+		//        music scripted? At the very least, it shouldn't try
+		//        to start song 0 at the beginning of the game, since
+		//        it's the end credits music.
+
+		if (_vm->getGameType() == GType_ITE) {
+			if (_sceneDescription.musicResourceId >= 0) {
+				event.type = kEvTOneshot;
+				event.code = kMusicEvent;
+				event.param = _sceneDescription.musicResourceId;
+				event.param2 = MUSIC_DEFAULT;
+				event.op = kEventPlay;
+				event.time = 0;
+
+				_vm->_events->queue(&event);
+			} else {
+				event.type = kEvTOneshot;
+				event.code = kMusicEvent;
+				event.op = kEventStop;
+				event.time = 0;
 
-			_vm->_events->queue(&event);
+				_vm->_events->queue(&event);
+			}
 		}
 
 		// Set scene background
-- 
cgit v1.2.3