[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.16,1.17 scummvm.cpp,1.47,1.48

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv5362/scumm

Modified Files:
	resource.cpp scummvm.cpp 
Log Message:
Fix "ripburger attacks Malcom" cutscene, by disabling pseudoRooms for V7 games.
They arn't used in FT at least, so I'm going to assume this could also fix the Dig.


Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- resource.cpp	29 Sep 2002 17:34:00 -0000	1.16
+++ resource.cpp	2 Oct 2002 13:25:06 -0000	1.17
@@ -470,7 +470,7 @@
 
 	debug(9, "ensureResourceLoaded(%s,%d)", resTypeFromId(type), i);
 
-	if (type == rtRoom && i > 127) {
+	if (type == rtRoom && i > 127 && !(_features & GF_AFTER_V7)) {
 		i = _resourceMapper[i & 127];
 	}
 

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- scummvm.cpp	1 Oct 2002 09:27:09 -0000	1.47
+++ scummvm.cpp	2 Oct 2002 13:25:06 -0000	1.48
@@ -578,7 +578,7 @@
 	_currentRoom = room;
 	_vars[VAR_ROOM] = room;
 
-	if (room >= 0x80)
+	if (room >= 0x80 &&  !(_features & GF_AFTER_V7))
 		_roomResource = _resourceMapper[room & 0x7F];
 	else
 		_roomResource = room;