From 3faa561c47088cb7678ae6ed35c1e7005122af61 Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Sat, 18 Jan 2003 14:16:55 +0000
Subject: fix compilation under VC6

svn-id: r6495
---
 scumm/object.cpp     | 4 ++--
 scumm/usage_bits.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scumm')

diff --git a/scumm/object.cpp b/scumm/object.cpp
index ea6c32e27b..488fe70efc 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -1693,8 +1693,8 @@ void Scumm::loadFlObject(uint object, uint room)
 
 	// 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)
diff --git a/scumm/usage_bits.cpp b/scumm/usage_bits.cpp
index 450b8cae84..3701fce0f8 100644
--- a/scumm/usage_bits.cpp
+++ b/scumm/usage_bits.cpp
@@ -26,8 +26,8 @@ void Scumm::upgradeGfxUsageBits()
 	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)
-- 
cgit v1.2.3