[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.293,1.294

kirben kirben at users.sourceforge.net
Wed Mar 2 03:57:48 CET 2005


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

Modified Files:
	resource.cpp 
Log Message:

Fix room resource loading in Buzzy games.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- resource.cpp	2 Mar 2005 05:01:52 -0000	1.293
+++ resource.cpp	2 Mar 2005 11:57:11 -0000	1.294
@@ -639,7 +639,7 @@
 
 	debugC(DEBUG_RESOURCE, "ensureResourceLoaded(%s,%d)", resTypeFromId(type), i);
 
-	if ((type == rtRoom) && i > 0x7F && _version < 7) {
+	if ((type == rtRoom) && i > 0x7F && _version < 7 && _heversion <= 71) {
 		i = _resourceMapper[i & 0x7F];
 	}
 
@@ -666,7 +666,7 @@
 	loadResource(type, i);
 
 	if (_version == 5 && type == rtRoom && i == _roomResource)
-			VAR(VAR_ROOM_FLAG) = 1;
+		VAR(VAR_ROOM_FLAG) = 1;
 }
 
 int ScummEngine::loadResource(int type, int idx) {





More information about the Scummvm-git-logs mailing list