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

[bluegr]

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:
df062c6baa SCI32: Fix game options crash in non-English PQ4 versions - bug #12901


Commit: df062c6baadfd9e6b01c80ec974a53538dac17f3
    https://github.com/scummvm/scummvm/commit/df062c6baadfd9e6b01c80ec974a53538dac17f3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-09-08T22:45:42+03:00

Commit Message:
SCI32: Fix game options crash in non-English PQ4 versions - bug #12901

Only enable the speech+subs toggle in the English version of PQ4.
French and German versions feature localized text with English voices.
Also, our injected speech+subtitles view is currently only in English.

Changed paths:
    engines/sci/engine/script_patches.cpp


diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index f90b87adee..483876b883 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -11686,7 +11686,7 @@ static const uint16 pq4LastActionHeroTimerPatch[] = {
 //          script, description,                                          signature                                           patch
 static const SciScriptPatcherEntry pq4Signatures[] = {
 	{  true,     6, "disable video benchmarking",                      1, sci2BenchmarkSignature,                             sci2BenchmarkPatch },
-	{  true,     9, "add speech+subtitles to in-game UI",              1, pq4CdSpeechAndSubtitlesSignature,                   pq4CdSpeechAndSubtitlesPatch },
+	{  false,    9, "add speech+subtitles to in-game UI",              1, pq4CdSpeechAndSubtitlesSignature,                   pq4CdSpeechAndSubtitlesPatch },
 	{  true,    42, "speech+subtitles talker compatibility (1/2)",     1, pq4CdSpeechAndSubtitlesTalkerSignature1,            pq4CdSpeechAndSubtitlesTalkerPatch1 },
 	{  true,    42, "speech+subtitles talker compatibility (2/2)",     1, pq4CdSpeechAndSubtitlesTalkerSignature2,            pq4CdSpeechAndSubtitlesTalkerPatch2 },
 	{  true,    43, "speech+subtitles talker compatibility (1/2)",     1, pq4CdSpeechAndSubtitlesTalkerSignature1,            pq4CdSpeechAndSubtitlesTalkerPatch1 },
@@ -22163,6 +22163,15 @@ void ScriptPatcher::processScript(uint16 scriptNr, SciSpan<byte> scriptData) {
 					enablePatch(signatureTable, "Floppy: fix peer bats, upper door (2/2)");
 				}
 				break;
+			case GID_PQ4:
+				if (g_sci->getLanguage() == Common::EN_ANY) {
+					// The in-game UI option for speech+subtitles makes sense only for the
+					// English version.
+					// French and German versions feature localized text with English voices.
+					// Also, our injected speech+subtitles view is currently only in English.
+					enablePatch(signatureTable, "add speech+subtitles to in-game UI");
+				}
+				break;
 			case GID_SQ1:
 				if (g_sci->getLanguage() == Common::ES_ESP) {
 					enablePatch(signatureTable, "spanish messages");