[Scummvm-git-logs] scummvm branch-2-1 -> 23631ad3863cee4ac986c879216e9c2175cbb9df

[sluicebox]

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:
23631ad386 SCI32: Update GK2 subtitle compatibility


Commit: 23631ad3863cee4ac986c879216e9c2175cbb9df
    https://github.com/scummvm/scummvm/commit/23631ad3863cee4ac986c879216e9c2175cbb9df
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-01-08T22:01:13-08:00

Commit Message:
SCI32: Update GK2 subtitle compatibility

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 6310829..f6c3658 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -3710,13 +3710,11 @@ static const uint16 gk2GameOverPriorityPatch[] = {
 
 // GK2 fans have created patches that add subtitles to the entire game. There
 //  are at least English and Spanish patch sets. Sierra added the subtitle
-//  feature solely for the Portuguese version, which along with the Italian
-//  version are the final localized versions of the game. The Italian version
-//  also contains the subtitle scripts even though it doesn't make of use the
-//  feature. The fan patches work by including these Italian scripts, replacing
-//  the Portuguese resources and strings, and configuring Sierra's interpreter
-//  to use the Portuguese language through RESOURCE.CFG. This sets GK2:printLang
-//  which the scripts test for Portuguese in order to activate subtitles.
+//  feature solely for the Portuguese version. The fan patches include these
+//  subtitle scripts, replace the Portuguese resources and embedded script
+//  strings, and configure Sierra's interpreter to use the Portuguese language
+//  through RESOURCE.CFG. This sets GK2:printLang which the scripts test for
+//  Portuguese in order to activate subtitles.
 //
 // The subtitle patches are compatible with ScummVM except for the requirement
 //  that GK2:printLang equals Portuguese (351) since we don't use RESOURCE.CFG.
@@ -3765,10 +3763,12 @@ static const SciScriptPatcherEntry gk2Signatures[] = {
 	{  true, 64990, "increase number of save games (1/2)",                 1, sci2NumSavesSignature1,            sci2NumSavesPatch1 },
 	{  true, 64990, "increase number of save games (2/2)",                 1, sci2NumSavesSignature2,            sci2NumSavesPatch2 },
 	{  true, 64990, "disable change directory button",                     1, sci2ChangeDirSignature,            sci2ChangeDirPatch },
+	{ false,     0, "subtitle patch compatibility",                        3, gk2SubtitleCompatibilitySignature, gk2SubtitleCompatibilityPatch },
 	{ false,    11, "subtitle patch compatibility",                        7, gk2SubtitleCompatibilitySignature, gk2SubtitleCompatibilityPatch },
-	{ false,    12, "subtitle patch compatibility",                        6, gk2SubtitleCompatibilitySignature, gk2SubtitleCompatibilityPatch },
-	{ false,    36, "subtitle patch compatibility",                        2, gk2SubtitleCompatibilitySignature, gk2SubtitleCompatibilityPatch },
+	{ false,    12, "subtitle patch compatibility",                        5, gk2SubtitleCompatibilitySignature, gk2SubtitleCompatibilityPatch },
+	{ false,    91, "subtitle patch compatibility",                        7, gk2SubtitleCompatibilitySignature, gk2SubtitleCompatibilityPatch },
 	{ false,   200, "subtitle patch compatibility",                        1, gk2SubtitleCompatibilitySignature, gk2SubtitleCompatibilityPatch },
+	{ false,  1300, "subtitle patch compatibility",                        1, gk2SubtitleCompatibilitySignature, gk2SubtitleCompatibilityPatch },
 	{ false, 64924, "subtitle patch compatibility",                        1, gk2SubtitleCompatibilitySignature, gk2SubtitleCompatibilityPatch },
 	SCI_SIGNATUREENTRY_TERMINATOR
 };