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

[Jonathan Gray]

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

Modified Files:
	object.cpp 
Log Message:
confine dodgy hack in indy3 that should probably be removed

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- object.cpp	10 Nov 2002 18:11:39 -0000	1.16
+++ object.cpp	11 Nov 2002 04:42:43 -0000	1.17
@@ -39,7 +39,7 @@
 		if (cls == 32)							// CLASS_TOUCHABLE
 			cls = 24;
 
-		if (_gameId == GID_INDY3_256 && cls == 22)			// Masking fix for Indy3
+		if (_gameId == GID_INDY3_256 && cls == 22 && _currentRoom == 76)			// Masking fix for Indy3
 			cls = 21;
 	}
 	return (_classData[obj] & (1 << (cls - 1))) != 0;
@@ -59,7 +59,7 @@
 		if (cls == 32)							// CLASS_TOUCHABLE
 			cls = 24;
 
-		if (_gameId == GID_INDY3_256 && cls == 22)			// Masking fix for Indy3
+		if (_gameId == GID_INDY3_256 && cls == 22 && _currentRoom == 76)			// Masking fix for Indy3
 			cls = 21;
 	}