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

[dwatteau]

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:
f7bdce7671 SCUMM: Adjust subtitle color workarounds for MI1 FM-TOWNS


Commit: f7bdce7671691259db8fb38e97039cd13c0dd70b
    https://github.com/scummvm/scummvm/commit/f7bdce7671691259db8fb38e97039cd13c0dd70b
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-10-07T13:34:59+02:00

Commit Message:
SCUMM: Adjust subtitle color workarounds for MI1 FM-TOWNS

In the FM-TOWNS version of Monkey Island 1, the inventory is limited to
16 colors, and it looks like the subtitles have a similar constraint, so
adjust the subtitle color workarounds for the priest and the head of the
navigator for this case, otherwise they would just be printed in white.

Changed paths:
    engines/scumm/script_v5.cpp


diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index f4265c717a5..9f8ef437a88 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -3437,7 +3437,7 @@ void ScummEngine_v5::decodeParseStringTextString(int textSlot) {
 		// releases (except for the SegaCD one with the smaller palette).
 		// Fix this while making sure that it doesn't apply to Elaine saying
 		// "I heard that!" offscreen.
-		_string[textSlot].color = 0xF9;
+		_string[textSlot].color = (_game.platform == Common::kPlatformFMTowns) ? 0x0A : 0xF9;
 		printString(textSlot, _scriptPointer);
 	} else if (_game.id == GID_MONKEY && _game.platform != Common::kPlatformSegaCD &&
 			(vm.slot[_currentScript].number == 140 || vm.slot[_currentScript].number == 294) &&
@@ -3450,7 +3450,7 @@ void ScummEngine_v5::decodeParseStringTextString(int textSlot) {
 		// options may also look wrong in that scene, but we don't fix that, as
 		// this font in displayed in green, white or purple between the
 		// different releases and scenes, so we don't know the original intent.
-		_string[textSlot].color = 0xEA;
+		_string[textSlot].color = (_game.platform == Common::kPlatformFMTowns) ? 0x0C : 0xEA;
 		printString(textSlot, _scriptPointer);
 	} else if (_game.id == GID_MONKEY && _roomResource == 25 && vm.slot[_currentScript].number == 205) {
 		printPatchedMI1CannibalString(textSlot, _scriptPointer);