[Scummvm-git-logs] scummvm master -> 484c0589f7c28c15e415b98bb84ccef2d20c04bd

[dwatteau]

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:
484c0589f7 SCUMM: Add more inline details about the Trac#1266 workaround


Commit: 484c0589f7c28c15e415b98bb84ccef2d20c04bd
    https://github.com/scummvm/scummvm/commit/484c0589f7c28c15e415b98bb84ccef2d20c04bd
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-08-17T14:54:27+02:00

Commit Message:
SCUMM: Add more inline details about the Trac#1266 workaround

Details taken from the Trac issue itself; I don't have this version.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 4e6f0141645..a598706e3f0 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -1232,7 +1232,7 @@ void ScummEngine_v5::o5_getActorRoom() {
 	getResultPos();
 	int act = getVarOrDirectByte(PARAM_1);
 
-	// WORKAROUND bug #832: Invalid actor XXX in o5_getActorRoom().
+	// WORKAROUND bug #832: Invalid actor in o5_getActorRoom().
 	//
 	// Script 94-206 is started by script 94-200 this way:
 	//
@@ -1515,7 +1515,12 @@ void ScummEngine_v5::o5_isLessEqual() {
 	int16 a = readVar(var);
 	int16 b = getVarOrDirectWord(PARAM_1);
 
-	// WORKAROUND bug #1266 : Work around a bug in Indy3Town.
+	// WORKAROUND bug #1266: INDY3TOWNS: Biplane controls are haywire.
+	// This is broken under UNZ too; the script does an incorrect signed
+	// comparison, possibly with the intent of checking for a gamepad.
+	//
+	// Since the biplane is unplayable without this, we don't check for
+	// `_enableEnhancements`, and always enable this fix.
 	if (_game.id == GID_INDY3 && (_game.platform == Common::kPlatformFMTowns) &&
 	    (vm.slot[_currentScript].number == 200 || vm.slot[_currentScript].number == 203) &&
 	    _currentRoom == 70 && b == -256) {