diff options
| author | Nicola Mettifogo | 2009-02-23 12:17:25 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2009-02-23 12:17:25 +0000 |
| commit | e3afa772e2ad494175b91e011304558150b8901a (patch) | |
| tree | 62ab9a1edb19dd5cbe2a1900f257dbb822014ba9 /engines/parallaction/input.cpp | |
| parent | 9bef5a0cfc5dcc0708d9f7d10e63b0b550d3243b (diff) | |
| download | scummvm-rg350-e3afa772e2ad494175b91e011304558150b8901a.tar.gz scummvm-rg350-e3afa772e2ad494175b91e011304558150b8901a.tar.bz2 scummvm-rg350-e3afa772e2ad494175b91e011304558150b8901a.zip | |
Cleanup.
svn-id: r38817
Diffstat (limited to 'engines/parallaction/input.cpp')
| -rw-r--r-- | engines/parallaction/input.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp index 3bedebb7f3..0967484513 100644 --- a/engines/parallaction/input.cpp +++ b/engines/parallaction/input.cpp @@ -297,7 +297,7 @@ bool Input::translateGameInput() { // test if mouse is hovering on an interactive zone for the currently selected inventory item ZonePtr z = _vm->hitZone(_activeItem._id, mousePos.x, mousePos.y); - if (((_mouseButtons == kMouseLeftUp) && (_activeItem._id == 0) && ((_engineFlags & kEngineWalking) == 0)) && ((!z) || ((z->_type & 0xFFFF) != kZoneCommand))) { + if (((_mouseButtons == kMouseLeftUp) && (_activeItem._id == 0) && ((_engineFlags & kEngineWalking) == 0)) && ((!z) || (ACTIONTYPE(z) != kZoneCommand))) { walkTo(mousePos); return true; } @@ -307,7 +307,7 @@ bool Input::translateGameInput() { return true; } - if ((_mouseButtons == kMouseLeftUp) && ((_activeItem._id != 0) || ((z->_type & 0xFFFF) == kZoneCommand))) { + if ((_mouseButtons == kMouseLeftUp) && ((_activeItem._id != 0) || (ACTIONTYPE(z) == kZoneCommand))) { if (z->_flags & kFlagsNoWalk) { // character doesn't need to walk to take specified action |