[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.59,1.60 usage_bits.cpp,1.3,1.4

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv8572

Modified Files:
	object.cpp usage_bits.cpp 
Log Message:
fix compilation under VC6

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- object.cpp	17 Jan 2003 15:23:27 -0000	1.59
+++ object.cpp	18 Jan 2003 14:16:55 -0000	1.60
@@ -1693,8 +1693,8 @@
 
 	// Lock room/roomScripts for the given room. They contains the OBCD/OBIM
 	// data, and a call to createResource might expire them, hence we lock them.
-	isRoomLocked = res.flags[rtRoom][room] & RF_LOCK;
-	isRoomScriptsLocked = res.flags[rtRoomScripts][room] & RF_LOCK;
+	isRoomLocked = ((res.flags[rtRoom][room] & RF_LOCK) != 0);
+	isRoomScriptsLocked = ((res.flags[rtRoomScripts][room] & RF_LOCK) != 0);
 	if (!isRoomLocked)
 		lock(rtRoom, room);
 	if (_features & GF_AFTER_V8 && !isRoomScriptsLocked)

Index: usage_bits.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/usage_bits.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- usage_bits.cpp	16 Jan 2003 18:07:52 -0000	1.3
+++ usage_bits.cpp	18 Jan 2003 14:16:55 -0000	1.4
@@ -26,8 +26,8 @@
 	int i;
 
 	for (i = 409; i >= 0; i--) {
-		bool dirty_bit = gfxUsageBits[i] & 0x80000000;
-		bool restored_bit = gfxUsageBits[i] & 0x40000000;
+		bool dirty_bit = ((gfxUsageBits[i] & 0x80000000) != 0);
+		bool restored_bit = ((gfxUsageBits[i] & 0x40000000) != 0);
 		
 		gfxUsageBits[3 * i] = gfxUsageBits[i] & 0x3FFFFFFF;
 		if (dirty_bit)