[Scummvm-cvs-logs] CVS: scummvm/saga scene.cpp,1.149,1.150

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30377

Modified Files:
	scene.cpp 
Log Message:
Disabled scene background music for IHNM, for now. It was trying to start
the end credits music right after the intro.


Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- scene.cpp	5 Oct 2005 01:40:55 -0000	1.149
+++ scene.cpp	6 Oct 2005 15:54:43 -0000	1.150
@@ -799,7 +799,6 @@
 		q_event = _vm->_events->chain(q_event, &event);
 	}
 
-
 	if (loadSceneParams->sceneProc == NULL) {
 		if (!_inGame) {
 			_inGame = true;
@@ -808,22 +807,29 @@
 
 		_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;
+		// 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.
 
-			_vm->_events->queue(&event);
-		} else {
-			event.type = kEvTOneshot;
-			event.code = kMusicEvent;
-			event.op = kEventStop;
-			event.time = 0;
+		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);
+				_vm->_events->queue(&event);
+			} else {
+				event.type = kEvTOneshot;
+				event.code = kMusicEvent;
+				event.op = kEventStop;
+				event.time = 0;
+
+				_vm->_events->queue(&event);
+			}
 		}
 
 		// Set scene background