[Scummvm-git-logs] scummvm master -> b63bc6bfd6fde49bbbde08841adabee71c7d87f9

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b63bc6bfd6 SCUMM: (ZAK/FM-TOWNS) - fix bug no. 13399


Commit: b63bc6bfd6fde49bbbde08841adabee71c7d87f9
    https://github.com/scummvm/scummvm/commit/b63bc6bfd6fde49bbbde08841adabee71c7d87f9
Author: athrxx (athrxx at scummvm.org)
Date: 2022-04-24T23:39:09+02:00

Commit Message:
SCUMM: (ZAK/FM-TOWNS) - fix bug no. 13399

(Counter door remains in closed status even though the Caponian just opened it)

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 5c780f873fd..7871a31e45a 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -1313,11 +1313,14 @@ void Actor_v3::walkActor() {
 			return;
 		}
 
-		// Can't walk through locked boxes
-		int flags = _vm->getBoxFlags(next_box);
-		if ((flags & kBoxLocked) && !((flags & kBoxPlayerOnly) && !isPlayer())) {
-			_moving |= MF_LAST_LEG;
-			return;
+		// This is version specific for ZAK FM-TOWNS. The flags check that is present in later SCUMM versions does not exist
+		// in SCUMM3. I have looked at disams of ZAK FM-TOWNS, LOOM FM-TOWNS, LOOM DOS EGA, INDY3 FM-TOWNS, INDY3 DOS VGA.
+		if (_vm->_game.id == GID_ZAK) {
+			// Check for equals, not for a bit mask (otherwise: bug no. 13399)
+			if (_vm->getBoxFlags(next_box) == kBoxLocked) {
+				_moving |= MF_LAST_LEG;
+				return;
+			}
 		}
 
 		_walkdata.curbox = next_box;