[Scummvm-cvs-logs] CVS: scummvm/scumm room.cpp,1.15,1.16 script_v7he.cpp,2.159,2.160

[kirben]

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

Modified Files:
	room.cpp script_v7he.cpp 
Log Message:

resourceMapper isn't used in HE72+ games.


Index: room.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/room.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- room.cpp	23 May 2005 02:00:48 -0000	1.15
+++ room.cpp	29 May 2005 13:08:25 -0000	1.16
@@ -112,7 +112,7 @@
 	_currentRoom = room;
 	VAR(VAR_ROOM) = room;
 
-	if (room >= 0x80 && _version < 7)
+	if (room >= 0x80 && _version < 7 && _heversion <= 71)
 		_roomResource = _resourceMapper[room & 0x7F];
 	else
 		_roomResource = room;

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.159
retrieving revision 2.160
diff -u -d -r2.159 -r2.160
--- script_v7he.cpp	28 May 2005 08:57:56 -0000	2.159
+++ script_v7he.cpp	29 May 2005 13:08:25 -0000	2.160
@@ -563,7 +563,7 @@
 		break;
 	case 111:		// SO_LOCK_ROOM
 		resid = pop();
-		if (resid > 0x7F)
+		if (_heversion <= 71 && resid > 0x7F)
 			resid = _resourceMapper[resid & 0x7F];
 		res.lock(rtRoom, resid);
 		res.lock(rtRoomImage, resid);
@@ -584,7 +584,7 @@
 		break;
 	case 115:		// SO_UNLOCK_ROOM
 		resid = pop();
-		if (resid > 0x7F)
+		if (_heversion <= 71 && resid > 0x7F)
 			resid = _resourceMapper[resid & 0x7F];
 		res.unlock(rtRoom, resid);
 		res.unlock(rtRoomImage, resid);