[Scummvm-git-logs] scummvm master -> 716ed40240759ffd57bacad9e663b6fa23d064aa

[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:
716ed40240 SCUMM: FREDDI4: change subtitles colors in final scene


Commit: 716ed40240759ffd57bacad9e663b6fa23d064aa
    https://github.com/scummvm/scummvm/commit/716ed40240759ffd57bacad9e663b6fa23d064aa
Author: BLooperZ (blooperz at users.noreply.github.com)
Date: 2022-07-26T10:39:26+03:00

Commit Message:
SCUMM: FREDDI4: change subtitles colors in final scene

Changed paths:
    engines/scumm/detection.h
    engines/scumm/detection_tables.h
    engines/scumm/he/script_v72he.cpp


diff --git a/engines/scumm/detection.h b/engines/scumm/detection.h
index c0c4f2cb6ac..a47610cc733 100644
--- a/engines/scumm/detection.h
+++ b/engines/scumm/detection.h
@@ -212,6 +212,7 @@ enum ScummGameId {
 	GID_PUTTZOO,
 	GID_FREDDI,
 	GID_FREDDI3,
+	GID_FREDDI4,
 	GID_BIRTHDAYRED,
 	GID_BIRTHDAYYELLOW,
 	GID_TREASUREHUNT,
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 4d2c4597498..b018396bad6 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -316,8 +316,8 @@ static const GameSettings gameVariantsTable[] = {
 
 	// Global scripts increased to 2048
 	{"blues123time", "", 0, GID_HEGAME, 6, 98, MDT_NONE, GF_USE_KEY | GF_HE_985, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT, GUIO_AUDIO_OVERRIDE)},
-	{"freddi4", "",       0, GID_HEGAME, 6, 98, MDT_NONE, GF_USE_KEY | GF_HE_985, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT, GUIO_AUDIO_OVERRIDE)},
-	{"freddi4", "unenc",  0, GID_HEGAME, 6, 98, MDT_NONE,              GF_HE_985, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT, GUIO_AUDIO_OVERRIDE)},
+	{"freddi4", "",       0, GID_FREDDI4, 6, 98, MDT_NONE, GF_USE_KEY | GF_HE_985, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT, GUIO_AUDIO_OVERRIDE)},
+	{"freddi4", "unenc",  0, GID_FREDDI4, 6, 98, MDT_NONE,              GF_HE_985, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT, GUIO_AUDIO_OVERRIDE)},
 
 	// Humongous Entertainment Scumm Version 9.9 ?  Scummsys.99
 	{"football", 0, 0, GID_FOOTBALL, 6, 99, MDT_NONE, GF_USE_KEY, UNK, GUIO4(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT, GUIO_AUDIO_OVERRIDE)},
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index 79aa99868f8..b12acea0205 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -880,6 +880,10 @@ void ScummEngine_v72he::o72_actorOps() {
 		break;
 	case 87:		// SO_TALK_COLOR
 		a->_talkColor = pop();
+		// WORKAROUND bug #13730: defined subtitles color 16 is very dark and hard to read on the dark background.
+		// we change it to brighter color to ease reading.
+		if (_game.id == GID_FREDDI4 && _game.heversion == 98 && _currentRoom == 43 && a->_talkColor == 16)
+			a->_talkColor = 200;
 		break;
 	case 88:		// SO_ACTOR_NAME
 		copyScriptString(string, sizeof(string));
@@ -2070,6 +2074,10 @@ void ScummEngine_v72he::decodeParseString(int m, int n) {
 		colors = pop();
 		if (colors == 1) {
 			_string[m].color = pop();
+			// WORKAROUND bug #13730: defined subtitles color 16 is very dark and hard to read on the dark background.
+			// we change it to brighter color to ease reading.
+			if (_game.id == GID_FREDDI4 && _game.heversion == 98 && _currentRoom == 43 && _string[m].color == 16)
+				_string[m].color = 200;
 		} else {
 			push(colors);
 			getStackList(args, ARRAYSIZE(args));