[Scummvm-git-logs] scummvm branch-2-3 -> 18601e51d77c2b273ebe63db9431a31a1d073d63
bluegr
bluegr at gmail.com
Sun Sep 12 19:28:12 UTC 2021
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
17c337a3a9 SCI32: Fix game options crash in non-English PQ4 versions - bug #12901
18601e51d7 SCUMM: Fill in missing language for 2 HES games
Commit: 17c337a3a99387867e93a4c28b2fff1003379774
https://github.com/scummvm/scummvm/commit/17c337a3a99387867e93a4c28b2fff1003379774
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-09-12T22:27:38+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 d73a7bc39b..bfa36f7403 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 },
@@ -22203,6 +22203,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");
Commit: 18601e51d77c2b273ebe63db9431a31a1d073d63
https://github.com/scummvm/scummvm/commit/18601e51d77c2b273ebe63db9431a31a1d073d63
Author: Ben Castricum (github at bencastricum.nl)
Date: 2021-09-12T22:27:38+03:00
Commit Message:
SCUMM: Fill in missing language for 2 HES games
Changed paths:
devtools/scumm-md5.txt
engines/scumm/scumm-md5.h
diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 4224de5db6..1a85051552 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -509,7 +509,7 @@ fbpack Fatty Bear's Fun Pack
f06e66fd45b2f8b0f4a2833ff4476050 -1 he DOS - - - sev
freddi Freddi Fish 1: The Case of the Missing Kelp Seeds
- d4cccb5af88f3e77f370896e9ba8c5f9 -1 All Windows HE 71 - - sev
+ d4cccb5af88f3e77f370896e9ba8c5f9 26078 en Windows HE 71 - - sev
01e51615b26e8ddf6ae88dd86e435d4a -1 en Windows HE 71 - - PaulPfenning
c0039ad982999c92d0de81910d640fa0 26159 nl Windows HE 71 - - adutchguy
68530d2e15f339fbbf3150b78b4d2ffb -1 en Mac HE 73 - - satz
@@ -831,7 +831,7 @@ puttputt Putt-Putt Joins the Parade
puttzoo Putt-Putt Saves the Zoo
70b0719ac3a5b47ae233c561823d5b96 -1 nl Mac - - - daniel9
58fdf4c7ad13540a734e18f8584cad89 -1 en Mac - - - khalek
- 1005456bfe351c1b679e1ff2dc2849e9 -1 All Windows - - - khalek
+ 1005456bfe351c1b679e1ff2dc2849e9 41998 en Windows - - - khalek
c3b22fa4654bb580b20325ebf4174841 -1 nl Windows - - - joostp
9781422e4288dbc090720e4563168ba7 -1 fr Windows - - - gist974
0f9d3317910ac7a9f449243118884ada 42070 de Windows - - - George Kormendi
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 36b6eb59ee..12045c31a4 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
/*
- This file was generated by the md5table tool on Mon Aug 23 13:36:37 2021
+ This file was generated by the md5table tool on Sat Sep 11 11:36:19 2021
DO NOT EDIT MANUALLY!
*/
@@ -70,7 +70,7 @@ static const MD5Table md5table[] = {
{ "0f9c7a76657f0840b8f7ccb5bffeb9f4", "indy3", "No AdLib", "EGA", -1, Common::FR_FRA, Common::kPlatformAtariST },
{ "0f9d3317910ac7a9f449243118884ada", "puttzoo", "", "", 42070, Common::DE_DEU, Common::kPlatformWindows },
{ "0fb73eddfcf584c02ba097984df131ba", "samnmax", "", "CD", 9080, Common::DE_DEU, Common::kPlatformUnknown },
- { "1005456bfe351c1b679e1ff2dc2849e9", "puttzoo", "", "", -1, Common::UNK_LANG, Common::kPlatformWindows },
+ { "1005456bfe351c1b679e1ff2dc2849e9", "puttzoo", "", "", 41998, Common::EN_ANY, Common::kPlatformWindows },
{ "100b4c8403ad6a83d4bf7dbf83e44dc4", "spyfox", "", "", -1, Common::FR_FRA, Common::kPlatformWindows },
{ "10d8e66cd11049ce64815ebb9fd76eb3", "spyozon", "", "", -1, Common::FR_FRA, Common::kPlatformUnknown },
{ "111b36172bdc9bfe498e135878c03d38", "pajama", "HE 101", "", 66878, Common::NL_NLD, Common::kPlatformWii },
@@ -626,7 +626,7 @@ static const MD5Table md5table[] = {
{ "d43352a805d78b5f4936c6d7779bf575", "samnmax", "", "CD", -1, Common::RU_RUS, Common::kPlatformDOS },
{ "d4aac997e2f4e15341f0bfbf905419bd", "PuttTime", "HE 99", "", 62698, Common::EN_GRB, Common::kPlatformWindows },
{ "d4b8ee426b1afd3e53bc0cf020418cf6", "dog", "HE 99", "", -1, Common::EN_ANY, Common::kPlatformWindows },
- { "d4cccb5af88f3e77f370896e9ba8c5f9", "freddi", "HE 71", "", -1, Common::UNK_LANG, Common::kPlatformWindows },
+ { "d4cccb5af88f3e77f370896e9ba8c5f9", "freddi", "HE 71", "", 26078 , Common::EN_ANY, Common::kPlatformWindows },
{ "d4e79c3d8645b8266cd78c325bc35154", "pajama2", "", "", 60557, Common::EN_USA, Common::kPlatformUnknown },
{ "d54622d31255619d207dd245d3f92327", "freddi4", "HE 99", "Demo", -1, Common::FR_FRA, Common::kPlatformWindows },
{ "d55eff37c2100f5065cde9de428621fa", "zak", "V2", "V2", -1, Common::EN_ANY, Common::kPlatformAtariST },
More information about the Scummvm-git-logs
mailing list