From ea613525f796da965c4037abd552ffa5d5e99507 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn <fuzzie@fuzzie.org>
Date: Tue, 18 May 2010 22:40:55 +0200
Subject: [PATCH] check kFlagsSelfuse in checkZoneBox, and check it along with kFlagsNoWalk
---
engines/parallaction/input.cpp | 2 +-
engines/parallaction/parallaction.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp
index 60cc867..6cffcdc 100644
a
|
b
|
bool Input::translateGameInput() {
|
326 | 326 | |
327 | 327 | if ((_mouseButtons == kMouseLeftUp) && ((_activeItem._id != 0) || (ACTIONTYPE(z) == kZoneCommand))) { |
328 | 328 | |
329 | | if (z->_flags & kFlagsNoWalk) { |
| 329 | if (z->_flags & kFlagsNoWalk || z->_flags & kFlagsSelfuse) { |
330 | 330 | // character doesn't need to walk to take specified action |
331 | 331 | takeAction(z); |
332 | 332 | } else { |
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 58fabea..a813ae2 100644
a
|
b
|
bool Parallaction::checkZoneBox(ZonePtr z, uint32 type, uint x, uint y) {
|
694 | 694 | if (checkSpecialZoneBox(z, type, x, y)) |
695 | 695 | return true; |
696 | 696 | |
697 | | if (z->getX() != -1) |
| 697 | if (z->getX() != -1 && !(z->_flags & kFlagsSelfuse)) |
698 | 698 | return false; |
699 | 699 | if (!_char._ani->hitFrameRect(x, y)) |
700 | 700 | return false; |