aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Brown2002-04-04 04:38:18 +0000
committerJames Brown2002-04-04 04:38:18 +0000
commita34bff0c87134b6e231be4bbf368c0d9f24cd066 (patch)
tree6b20905e1d6614c2a81242a91bf865f6688c8d81
parent22d93323fa39edd5bd5ffbe28afd521d56ac7d3c (diff)
downloadscummvm-rg350-a34bff0c87134b6e231be4bbf368c0d9f24cd066.tar.gz
scummvm-rg350-a34bff0c87134b6e231be4bbf368c0d9f24cd066.tar.bz2
scummvm-rg350-a34bff0c87134b6e231be4bbf368c0d9f24cd066.zip
Always remember, = != ==, and & != &&
svn-id: r3857
-rw-r--r--object.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/object.cpp b/object.cpp
index ae25a4ef53..7e11c83993 100644
--- a/object.cpp
+++ b/object.cpp
@@ -28,7 +28,7 @@ bool Scumm::getClass(int obj, int cls) {
cls &= 0x7F;
checkRange(32,1,cls,"Class %d out of range in getClass");
- if (_features && GF_SMALL_HEADER) {
+ if (_features & GF_SMALL_HEADER) {
byte *oldClass = (byte*)&_classData[obj];
if (cls == 32) // CLASS_TOUCHABLE
cls = 23;
@@ -44,7 +44,7 @@ void Scumm::putClass(int obj, int cls, bool set) {
cls &= 0x7F;
checkRange(32,1,cls,"Class %d out of range in getClass");
- if (_features && GF_SMALL_HEADER) {
+ if (_features & GF_SMALL_HEADER) {
byte *oldClass = (byte*)&_classData[obj];
if (cls == 32) // CLASS_TOUCHABLE
cls = 23;