[Scummvm-cvs-logs] CVS: scummvm/saga rscfile.cpp,1.32,1.33

Eugene Sandulenko sev at users.sourceforge.net
Sat Aug 6 09:06:25 CEST 2005


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

Modified Files:
	rscfile.cpp 
Log Message:
Fixes for metaResources loading


Index: rscfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- rscfile.cpp	6 Aug 2005 14:26:59 -0000	1.32
+++ rscfile.cpp	6 Aug 2005 16:05:13 -0000	1.33
@@ -425,6 +425,9 @@
 static int metaResourceTable[] = { 0, 326, 517, 677, 805, 968, 1165, 0, 1271 };
 
 void Resource::loadGlobalResources(int chapter, int actorsEntrance) {
+	if (chapter < 0)
+		chapter = 8;
+
 	// TODO
 	//if (module.voiceLUT)
 	//	free module.voiceLUT;
@@ -468,6 +471,10 @@
 	_vm->_actor->loadList(actorsEntrance, _metaResource.actorCount,
 						  _metaResource.actorsResourceID, _metaResource.protagStatesCount,
 						  _metaResource.protagStatesResourceID);
+
+	_vm->_actor->_protagonist->sceneNumber = _metaResource.sceneIndex;
+
+	
 }
 
 } // End of namespace Saga





More information about the Scummvm-git-logs mailing list