[Scummvm-git-logs] scummvm master -> 0944138334d5a83538682a0b9e4973a1b2e7e0c6

[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:
0944138334 SCUMM: Fix some placeholder text in the bar in French FT (WORKAROUND)


Commit: 0944138334d5a83538682a0b9e4973a1b2e7e0c6
    https://github.com/scummvm/scummvm/commit/0944138334d5a83538682a0b9e4973a1b2e7e0c6
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-18T03:51:35+02:00

Commit Message:
SCUMM: Fix some placeholder text in the bar in French FT (WORKAROUND)

In the French release of Full Throttle, when Ben looks at one of the
small pictures above the piano, a strange "piano-low-kick" string
appears in the subtitle. Just drop it and replace it with the missing
characters in order to match what he's saying (as done in the 2017
remaster).

Changed paths:
    engines/scumm/detection_tables.h
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 692ace7e8a5..7f708e366d3 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -213,7 +213,7 @@ static const GameSettings gameVariantsTable[] = {
 	{"samnmax",  "", 0, GID_SAMNMAX,  6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO3(GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
 	{"samnmax",  "Floppy", 0, GID_SAMNMAX,  6, 0, MDT_ADLIB | MDT_MIDI | MDT_PREFER_GM, GF_USE_KEY, UNK, GUIO4(GUIO_NOSPEECH, GUIO_RENDEREGA, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
 
-	{"ft",   "", 0, GID_FT,  7, 0, MDT_NONE, 0, UNK, GUIO2(GUIO_NOMIDI, GUIO_ORIGINALGUI)},
+	{"ft",   "", 0, GID_FT,  7, 0, MDT_NONE, 0, UNK, GUIO3(GUIO_NOMIDI, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
 	{"ft",   "Demo", 0, GID_FT,  7, 0, MDT_NONE, GF_DEMO, UNK, GUIO2(GUIO_NOMIDI, GUIO_ORIGINALGUI)},
 
 	{"dig",  "", 0, GID_DIG, 7, 0, MDT_NONE, 0, UNK, GUIO3(GUIO_NOMIDI, GUIO_ENHANCEMENTS, GUIO_ORIGINALGUI)},
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index a2222bd36bb..910eecc7f4b 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -2405,6 +2405,28 @@ void ScummEngine_v6::o6_talkActor() {
 		return;
 	}
 
+	// WORKAROUND: In the French release of Full Throttle, a "piano-low-kick"
+	// string appears in the text when Ben looks at one of the small pictures
+	// above the piano in the bar. Probably an original placeholder which
+	// hasn't been properly replaced... Fixed in the 2017 remaster, though.
+	if (_game.id == GID_FT && _language == Common::FR_FRA
+		&& _roomResource == 7 && vm.slot[_currentScript].number == 77
+		&& _actorToPrintStrFor == 1 && _enableEnhancements) {
+		const int len = resStrLen(_scriptPointer) + 1;
+		if (len == 93 && memcmp(_scriptPointer + 16 + 18, "piano-low-kick", 14) == 0) {
+			byte *tmpBuf = new byte[len - 14 + 3];
+			memcpy(tmpBuf, _scriptPointer, 16 + 18);
+			memcpy(tmpBuf + 16 + 18, ", 1", 3);
+			memcpy(tmpBuf + 16 + 18 + 3, _scriptPointer + 16 + 18 + 14, len - (16 + 18 + 14));
+
+			_string[0].loadDefault();
+			actorTalk(tmpBuf);
+			delete[] tmpBuf;
+			_scriptPointer += len;
+			return;
+		}
+	}
+
 	_string[0].loadDefault();
 	actorTalk(_scriptPointer);