aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/parallaction.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2007-05-16 19:23:14 +0000
committerNicola Mettifogo2007-05-16 19:23:14 +0000
commitf243227f098824a74eae078531ccf6af539dfbcb (patch)
tree64c9d70351c3b6991d35a0128d8a9075d1434d2b /engines/parallaction/parallaction.cpp
parentb3c582e4c787c888435c3967b1438bba9359c354 (diff)
downloadscummvm-rg350-f243227f098824a74eae078531ccf6af539dfbcb.tar.gz
scummvm-rg350-f243227f098824a74eae078531ccf6af539dfbcb.tar.bz2
scummvm-rg350-f243227f098824a74eae078531ccf6af539dfbcb.zip
Replaced explicit bitmasks with function calls.
svn-id: r26855
Diffstat (limited to 'engines/parallaction/parallaction.cpp')
-rw-r--r--engines/parallaction/parallaction.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 6095e43c40..f21e6e9a5e 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -561,7 +561,7 @@ Parallaction::InputData *Parallaction::translateInput() {
return &_input;
}
- if (((_mouseButtons == kMouseLeftUp) && (_activeItem._id == 0) && ((_engineFlags & kEngineWalking) == 0)) && ((z == NULL) || ((z->_type & 0xFFFF) != kZoneCommand))) {
+ if (((_mouseButtons == kMouseLeftUp) && (_activeItem._id == 0) && ((_engineFlags & kEngineWalking) == 0)) && ((z == NULL) || (z->type() != kZoneCommand))) {
_input._event = kEvWalk;
return &_input;
}
@@ -584,7 +584,7 @@ Parallaction::InputData *Parallaction::translateInput() {
return &_input;
}
- if ((_mouseButtons == kMouseLeftUp) && ((_activeItem._id != 0) || ((z->_type & 0xFFFF) == kZoneCommand))) {
+ if ((_mouseButtons == kMouseLeftUp) && ((_activeItem._id != 0) || (z->type() == kZoneCommand))) {
_input._zone = z;
if (z->_flags & kFlagsNoWalk) {