[Scummvm-cvs-logs] SF.net SVN: scummvm: [28745] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 28745
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28745&view=rev
Author:   thebluegr
Date:     2007-08-25 22:03:59 -0700 (Sat, 25 Aug 2007)

Log Message:
-----------
One more place where music for chapter 6 shouldn't be played for now

Modified Paths:
--------------
    scummvm/trunk/engines/saga/saveload.cpp
    scummvm/trunk/engines/saga/sfuncs.cpp

Modified: scummvm/trunk/engines/saga/saveload.cpp
===================================================================
--- scummvm/trunk/engines/saga/saveload.cpp	2007-08-26 03:32:18 UTC (rev 28744)
+++ scummvm/trunk/engines/saga/saveload.cpp	2007-08-26 05:03:59 UTC (rev 28745)
@@ -274,7 +274,8 @@
 			// incorrect, and the game crashes here when trying to load a music track there. For now,
 			// just don't change the music track for chapter 6
 			// FIXME: Figure out what's wrong with the loaded music track and remove this hack
-			// Note that when this hack is removed, remove it from Script::sfPlayMusic as well
+			// Note that when this hack is removed, remove it from Script::sfPlayMusic and 
+			// Script::sfQueueMusic as well
 			if (getGameType() == GType_IHNM && _scene->currentChapterNumber() == 6) {
 				// do nothing
 			} else {

Modified: scummvm/trunk/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/trunk/engines/saga/sfuncs.cpp	2007-08-26 03:32:18 UTC (rev 28744)
+++ scummvm/trunk/engines/saga/sfuncs.cpp	2007-08-26 05:03:59 UTC (rev 28745)
@@ -1680,7 +1680,8 @@
 			// incorrect, and the game crashes here when trying to load a music track there. For now,
 			// just don't change the music track for chapter 6
 			// FIXME: Figure out what's wrong with the loaded music track and remove this hack
-			// Note that when this hack is removed, remove it from SagaEngine::load as well
+			// Note that when this hack is removed, remove it from SagaEngine::load and 
+			// Script::sfQueueMusic as well
 			if (_vm->getGameType() == GType_IHNM && _vm->_scene->currentChapterNumber() == 6)
 				return;
 			_vm->_music->play(_vm->_music->_songTable[param1], param2 ? MUSIC_LOOP : MUSIC_NORMAL);
@@ -2149,6 +2150,15 @@
 		return;
 	}
 
+	// HACK for chapter 6 (last chapter) in IHNM. For some reason, the songtable loaded is
+	// incorrect, and the game crashes here when trying to load a music track there. For now,
+	// just don't change the music track for chapter 6
+	// FIXME: Figure out what's wrong with the loaded music track and remove this hack
+	// Note that when this hack is removed, remove it from SagaEngine::load and 
+	// Script::sfPlayMusic as well
+	if (_vm->getGameType() == GType_IHNM && _vm->_scene->currentChapterNumber() == 6)
+		return;
+
 	if (param1 >= _vm->_music->_songTableLen) {
 		warning("sfQueueMusic: Wrong song number (%d > %d)", param1, _vm->_music->_songTableLen - 1);
 	} else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.