Ticket #4669: checkDoorOnlyFromUser.patch

engines/parallaction/parallaction_ns.cpp

@@ -546 +546 @@
 
 
 void Parallaction_ns::scheduleWalk(int16 x, int16 y, bool fromUser) {
+        debugC(1, kDebugWalk, "Parallaction_ns::scheduleWalk(x:%d, y:%d, fromUser:%d)", x, y, fromUser);
         AnimationPtr a = _char._ani;
 
         if ((a->_flags & kFlagsRemove) || (a->_flags & kFlagsActive) == 0) {
                 return;
         }
 
-        _walker->buildPath(a, x, y);
+        debugC(1, kDebugWalk, "\tbuilding Path");
+        _walker->buildPath(a, x, y, fromUser);
         _engineFlags |= kEngineWalking;
 }
 

engines/parallaction/walk.cpp

@@ -168 +168 @@
 }
 
 //      x, y: mouse click (foot) coordinates
-void PathWalker_NS::buildPath(AnimationPtr a, uint16 x, uint16 y) {
+void PathWalker_NS::buildPath(AnimationPtr a, uint16 x, uint16 y, bool fromUser) {
         debugC(1, kDebugWalk, "PathBuilder::buildPath to (%i, %i)", x, y);
 
         _a = a;
+        _fromUser = fromUser;
 
         _walkPath.clear();
 
@@ -278 +279 @@
 }
 
 void PathWalker_NS::checkDoor(const Common::Point &foot) {
+        debugC(1, kDebugWalk, "PathWalker_NS::checkDoor()");
         ZonePtr z = _vm->hitZone(kZoneDoor, foot.x, foot.y);
         if (z) {
                 if ((z->_flags & kFlagsClosed) == 0) {
@@ -306 +308 @@
 }
 
 void PathWalker_NS::finalizeWalk() {
+        debugC(1, kDebugWalk, "PathWalker_NS::finalizeWalk()");
         _engineFlags &= ~kEngineWalking;
 
         Common::Point foot;
         _a->getFoot(foot);
-        checkDoor(foot);
+        if (_fromUser)
+                checkDoor(foot);
 
         _walkPath.clear();
 }
@@ -382 +386 @@
         _a->setF(frames->firstWalkFrame[_direction] + (_step / frames->frameRepeat[_direction]) % frames->numWalkFrames[_direction]);
 }
 
-PathWalker_NS::PathWalker_NS() : _direction(WALK_DOWN), _step(0) {
+PathWalker_NS::PathWalker_NS() : _direction(WALK_DOWN), _step(0), _fromUser(false) {
 }
 
 bool PathWalker_BR::directPathExists(const Common::Point &from, const Common::Point &to) {

engines/parallaction/walk.h

@@ -36 +36 @@
         AnimationPtr _a;
         PointList       _walkPath;
         int16           _direction, _step;
+        bool _fromUser;
 
         // builder routines
         PointList       _subPath;
@@ -52 +53 @@
 public:
         PathWalker_NS();
 
-        void buildPath(AnimationPtr a, uint16 x, uint16 y);
+        void buildPath(AnimationPtr a, uint16 x, uint16 y, bool fromUser);
         void walk();
 };