[Scummvm-git-logs] scummvm master -> 53cff7c2396c885092695f5ccd36cc2a4d719f71

[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:
53cff7c239 SCUMM: (MM/V1) - fix walk code bug


Commit: 53cff7c2396c885092695f5ccd36cc2a4d719f71
    https://github.com/scummvm/scummvm/commit/53cff7c2396c885092695f5ccd36cc2a4d719f71
Author: athrxx (athrxx at scummvm.org)
Date: 2022-07-10T20:21:35+02:00

Commit Message:
SCUMM: (MM/V1) - fix walk code bug

(in the bathroom with the mummy in the tub, applies to v1 only)

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index dd25aafc114..284bf6bc8f8 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -3355,7 +3355,12 @@ bool Actor::isPlayer() {
 bool Actor_v2::isPlayer() {
 	// isPlayer() is not supported by v0
 	assert(_vm->_game.version != 0);
-	return _vm->VAR(42) <= _number && _number <= _vm->VAR(43);
+	// MM V1 PC uses VAR_EGO and not VARS 42 / 43. ZAK V1 does already have VARS 42 / 43 here.
+	// For MM NES I do not have a disasm and the room I used to test it (MM room 24) also has
+	// different box flags in the NES version, so it will not even call into this function.
+	// However, I could at least confirm that VARS 42 and 43 are both set to 0, so apparently
+	// not in use.
+	return (_vm->_game.id == GID_MANIAC && _vm->_game.version == 1) ? (_number == _vm->VAR(_vm->VAR_EGO)) : (_vm->VAR(42) <= _number && _number <= _vm->VAR(43));
 }
 
 void ActorHE::setHEFlag(int bit, int set) {