[Scummvm-git-logs] scummvm master -> 6572d3c3df044664b42ec8d4635aa15ddac4d7ce

[AndywinXp]

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:
6572d3c3df SCUMM: Remove an unneeded 20 years old LOOM CD workaround


Commit: 6572d3c3df044664b42ec8d4635aa15ddac4d7ce
    https://github.com/scummvm/scummvm/commit/6572d3c3df044664b42ec8d4635aa15ddac4d7ce
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-10-17T16:01:10+02:00

Commit Message:
SCUMM: Remove an unneeded 20 years old LOOM CD workaround

20 years ago this was needed because it was assumed that actor 0 was an invalid actor, but that
simply isn't true. In the original this particular call failed because actor 0 wasn't in the current room,
and this is exactly what happens now on our end, when removing this workaround.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index e2cd4245b4a..1c6f42a184d 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -3187,15 +3187,6 @@ void ScummEngine_v5::o5_walkActorToActor() {
 	int nr2 = getVarOrDirectByte(PARAM_2);
 	int dist = fetchScriptByte();
 
-	if (_game.id == GID_LOOM && _game.version == 4 && nr == 1 && nr2 == 0 &&
-		dist == 255 && vm.slot[_currentScript].number == 98) {
-		// WORKAROUND bug #814: LoomCD script 98 contains this:
-		//   walkActorToActor(1,0,255)
-		// Once again this is either a script bug, or there is some hidden
-		// or unknown meaning to this odd walk request...
-		return;
-	}
-
 	if (_game.id == GID_INDY4 && nr == 1 && nr2 == 106 &&
 		dist == 255 && vm.slot[_currentScript].number == 210) {
 		// WORKAROUND bug: Work around an invalid actor bug when using the