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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Aug 26 05:24:39 CEST 2007


Revision: 28743
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28743&view=rev
Author:   thebluegr
Date:     2007-08-25 20:24:39 -0700 (Sat, 25 Aug 2007)

Log Message:
-----------
The music table loaded for chapter 6 (final chapter) in IHNM is problematic, so don't load any music for that chapter until the cause is found

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

Modified: scummvm/trunk/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/trunk/engines/saga/sfuncs.cpp	2007-08-26 03:22:52 UTC (rev 28742)
+++ scummvm/trunk/engines/saga/sfuncs.cpp	2007-08-26 03:24:39 UTC (rev 28743)
@@ -1676,6 +1676,12 @@
 			warning("sfPlayMusic: Wrong song number (%d > %d)", param1, _vm->_music->_songTableLen - 1);
 		} else {
 			_vm->_music->setVolume(_vm->_musicVolume == 10 ? -1 : _vm->_musicVolume * 25, 1);
+			// 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
+			if (_vm->getGameType() == GType_IHNM && _vm->_scene->currentChapterNumber() == 6)
+				return;
 			_vm->_music->play(_vm->_music->_songTable[param1], param2 ? MUSIC_LOOP : MUSIC_NORMAL);
 			if (!_vm->_scene->haveChapterPointsChanged()) {
 				_vm->_scene->setCurrentMusicTrack(param1);


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




More information about the Scummvm-git-logs mailing list