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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sat Sep 1 15:55:13 CEST 2007


Revision: 28786
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28786&view=rev
Author:   thebluegr
Date:     2007-09-01 06:55:13 -0700 (Sat, 01 Sep 2007)

Log Message:
-----------
The music of chapter 6 in IHNM is loaded correctly now

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

Modified: scummvm/trunk/engines/saga/rscfile.cpp
===================================================================
--- scummvm/trunk/engines/saga/rscfile.cpp	2007-09-01 12:43:22 UTC (rev 28785)
+++ scummvm/trunk/engines/saga/rscfile.cpp	2007-09-01 13:55:13 UTC (rev 28786)
@@ -748,16 +748,14 @@
 	_vm->_anim->loadCutawayList(resourcePointer, resourceLength);
 
 	if (_metaResource.songTableID > 0) {
-		// FIXME: HACK for chapter 6 (last chapter) of IHNM. For some reason, the songtable with songTableID
-		// 1028 can't be loaded properly, so it's substituted here with Gorrister's songtable (ID 116)
-		// The strange thing is that the song invoked when each character enters the final chapter is
-		// supposed to be different, but the song numbers called by sfPlayMusic/sfQueueMusic are the 
-		// same every time, which leads me to believe that a different meta resource is loaded depending
-		// on the character selected
-		if (_vm->getGameType() == GType_IHNM && _metaResource.songTableID == 1028)
-			_metaResource.songTableID = 116;
 		_vm->_resource->loadResource(resourceContext, _metaResource.songTableID, resourcePointer, resourceLength);
 
+		if (chapter == 6) {
+			int32 id = READ_LE_UINT32(&resourcePointer[actorsEntrance * 4]);
+			free(resourcePointer);
+			_vm->_resource->loadResource(resourceContext, id, resourcePointer, resourceLength);
+		}
+
 		if (resourceLength == 0) {
 			error("Resource::loadGlobalResources Can't load songs list for current track");
 		}


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