[Scummvm-git-logs] scummvm master -> 3a4e3879f40e9e6dec767281928c13d6b6929c38

[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:
3a4e3879f4 SCUMM: partial revert of c57243ae (limit to SCUMM3)


Commit: 3a4e3879f40e9e6dec767281928c13d6b6929c38
    https://github.com/scummvm/scummvm/commit/3a4e3879f40e9e6dec767281928c13d6b6929c38
Author: athrxx (athrxx at scummvm.org)
Date: 2021-06-13T01:28:55+02:00

Commit Message:
SCUMM: partial revert of c57243ae (limit to SCUMM3)

This is only supposed to apply to SCUMM3. It is a bit difficult to recognize this from SCUMM1/2 disasm, since things happen in a different order there. But it actually causes glitches in SCUMM1/2 (actors are slowed down sometimes) and it isn't required for bugs like no. 12278 (which has been fixed for SCUMM1/2 by one of my other recent commits).

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 30d48aff72..3da2e34cb0 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -542,8 +542,8 @@ int Actor::actorWalkStep() {
 			startWalkAnim(1, nextFacing);
 		}
 		_moving |= MF_IN_LEG;
-		// The next two lines fix bug #12278. I limit this to <= SCUMM3 for now, since I have only checked disasms of ZAK FM-TOWNS, ZAK DOS V1, LOOM DOS.
-		if (_vm->_game.version <= 3)
+		// The next two lines fix bug #12278 for ZAK FM-TOWNS. Limited to SCUMM3.
+		if (_vm->_game.version == 3)
 			return 1;
 	}