aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-09-26 15:44:49 +0000
committerMax Horn2004-09-26 15:44:49 +0000
commit925d7d1aa1b994693da0bfc7d542e30f000bea9f (patch)
tree4337c09285bd61c348c9caea5959bd9e2a322208
parent914d00f51a5c3ea06dee7481f157e21baefde1b0 (diff)
downloadscummvm-rg350-925d7d1aa1b994693da0bfc7d542e30f000bea9f.tar.gz
scummvm-rg350-925d7d1aa1b994693da0bfc7d542e30f000bea9f.tar.bz2
scummvm-rg350-925d7d1aa1b994693da0bfc7d542e30f000bea9f.zip
Use enums instead of hard coding assumptions about their values (i.e. 1 in this case)
svn-id: r15294
-rw-r--r--scumm/object.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index fcadfb88e1..84ce62fef0 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -477,9 +477,9 @@ void ScummEngine::drawObject(int obj, int arg) {
if (numstrip != 0) {
byte flags;
if (_version == 8)
- flags = (od.flag & 16) == 0;
+ flags = ((od.flag & 16) == 0) ? Gdi::dbAllowMaskOr : 0;
else if (_features & GF_HUMONGOUS)
- flags = (od.flag & 1) != 0;
+ flags = ((od.flag & 1) != 0) ? Gdi::dbAllowMaskOr : 0;
else
flags = Gdi::dbAllowMaskOr;