Ticket #9175: check-kFlagsYourself.patch

engines/parallaction/input.cpp

@@ -326 +326 @@
 
         if ((_mouseButtons == kMouseLeftUp) && ((_activeItem._id != 0) || (ACTIONTYPE(z) == kZoneCommand))) {
 
-                if (z->_flags & kFlagsNoWalk) {
-                        // character doesn't need to walk to take specified action
+                bool noWalk = z->_flags & kFlagsNoWalk; // check the explicit no-walk flag
+                if (_gameType == GType_BRA) {
+                        // action performed on object marked for self-use do not need walk in BRA
+                        noWalk |= z->_flags & kFlagsYourself;
+                }
+
+                if (noWalk) {
                         takeAction(z);
                 } else {
                         // action delayed: if Zone defined a moveto position the character is programmed to move there,

engines/parallaction/objects.h

@@ -88 +88 @@
         kFlagsNoWalk            = 0x800,                        // Zone: character doesn't need to walk towards object to interact
 
         // BRA specific
-        kFlagsYourself          = 0x1000,
+        kFlagsYourself          = 0x1000,                       // BRA: marks zones used by the character on him/herself
         kFlagsScaled            = 0x2000,
-        kFlagsSelfuse           = 0x4000,
+        kFlagsSelfuse           = 0x4000,                       // BRA: marks zones to be preserved across location changes (see Parallaction::freeZones)
         kFlagsIsAnimation       = 0x1000000,            // BRA: used in walk code (trap check), to tell is a Zone is an Animation
         kFlagsAnimLinked        = 0x2000000
 };

engines/parallaction/parallaction.cpp

@@ -687 +687 @@
         debugC(5, kDebugExec, "checkZoneBox for %s (type = %x, x = %i, y = %i)", z->_name, type, x, y);
 
         if (!z->hitRect(x, y)) {
-
                 // check for special zones (items defined in common.loc)
                 if (checkSpecialZoneBox(z, type, x, y))
                         return true;
 
-                if (z->getX() != -1)
-                        return false;
-                if (!_char._ani->hitFrameRect(x, y))
+                // check if self-use zone (nothing to do with kFlagsSelfuse)
+                int gameType = getGameType();
+                if (gameType == GType_Nippon) {
+                        if (z->getX() != -1) {  // no explicit self-use flag in NS
+                                return false;
+                        }
+                }
+                if (gameType == GType_BRA) {
+                        if (!(z->_flags & kFlagsYourself)) {
+                                return false;
+                        }
+                }
+                if (!_char._ani->hitFrameRect(x, y)) {
                         return false;
+                }
+                // we get here only if (x,y) hits the character and the zone is marked as self-use
         }
 
         // normal Zone