diff options
| author | Paweł Kołodziejski | 2003-01-18 14:16:55 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2003-01-18 14:16:55 +0000 |
| commit | 3faa561c47088cb7678ae6ed35c1e7005122af61 (patch) | |
| tree | c43c2280c88cea27809707b0a3f544096220c4df /scumm/object.cpp | |
| parent | 050a3fcd12e93331997edca88f2cdb8c863db0f0 (diff) | |
| download | scummvm-rg350-3faa561c47088cb7678ae6ed35c1e7005122af61.tar.gz scummvm-rg350-3faa561c47088cb7678ae6ed35c1e7005122af61.tar.bz2 scummvm-rg350-3faa561c47088cb7678ae6ed35c1e7005122af61.zip | |
fix compilation under VC6
svn-id: r6495
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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) |