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

[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:
e452349eea SCUMM: remove obsolete workaround


Commit: e452349eeac53c38fc7a6c103eba405774cd425b
    https://github.com/scummvm/scummvm/commit/e452349eeac53c38fc7a6c103eba405774cd425b
Author: athrxx (athrxx at scummvm.org)
Date: 2021-07-04T21:15:32+02:00

Commit Message:
SCUMM: remove obsolete workaround

(obsolete due to f039bdb0)

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index ed141275b7..d5ec89541c 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1060,15 +1060,9 @@ void ScummEngine_v5::o5_getActorY() {
 	int a;
 	getResultPos();
 
-	if ((_game.id == GID_INDY3) && !(_game.platform == Common::kPlatformMacintosh)) {
+	if ((_game.id == GID_INDY3) && !(_game.platform == Common::kPlatformMacintosh))
 		a = getVarOrDirectByte(PARAM_1);
-
-		// WORKAROUND bug #560 (can't get into Zeppelin)
-		if (_roomResource == 36) {
-			setResult(getObjY(a) - 1);
-			return;
-		}
-	} else
+	else
 		a = getVarOrDirectWord(PARAM_1);
 
 	setResult(getObjY(a));