[Scummvm-git-logs] scummvm master -> 70f0dff173e9a80d87c495e75ebadfbb8e2785a6

[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:
70f0dff173 KYRA: add workaround for bug no. 12635


Commit: 70f0dff173e9a80d87c495e75ebadfbb8e2785a6
    https://github.com/scummvm/scummvm/commit/70f0dff173e9a80d87c495e75ebadfbb8e2785a6
Author: athrxx (athrxx at scummvm.org)
Date: 2021-06-17T01:07:19+02:00

Commit Message:
KYRA: add workaround for bug no. 12635

"KYRA: Missing subtitle (also in original game)"

Changed paths:
    engines/kyra/engine/scene_lok.cpp


diff --git a/engines/kyra/engine/scene_lok.cpp b/engines/kyra/engine/scene_lok.cpp
index 55ae729320..c26e0ccba1 100644
--- a/engines/kyra/engine/scene_lok.cpp
+++ b/engines/kyra/engine/scene_lok.cpp
@@ -806,6 +806,20 @@ void KyraEngine_LoK::initSceneScreen(int brandonAlive) {
 		}
 	}
 
+	// WORKAROUND for bug #12635 ("KYRA: Missing subtitle(also in original game)")
+	// This is a script bug that seems to be present in early English talkie versions, but
+	// not in later versions (e. g. German talkie). Unfortunately it seems to have made its
+	// way into several fan translations (e.g. Hebrew, Spanish), since these were based on
+	// the bugged English version. The opcodes have to be rearranged a bit...
+	if (_flags.isTalkie && !scumm_strnicmp("POTION.EMC", _scriptClick.dataPtr->filename, 12)) {
+		assert(_scriptClick.dataPtr->dataSize >= 0x99E);
+		uint16 *loc = &_scriptClick.dataPtr->data[0x4CA];
+		if (*loc == 0x4e35) {
+			for (int i = 0; i < 4; ++i)
+				SWAP(loc[i], loc[i + 1]);
+		}
+	}
+
 	if (!_emc->start(&_scriptClick, 2))
 		error("Could not start script function 2 of scene script");