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

[AndywinXp]

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:
db03ce28cf SCUMM: Make subtitle color change optional


Commit: db03ce28cfdd82917147ae1004921b5b30e8755d
    https://github.com/scummvm/scummvm/commit/db03ce28cfdd82917147ae1004921b5b30e8755d
Author: BLooperZ (blooperz at users.noreply.github.com)
Date: 2023-09-13T22:02:46+02:00

Commit Message:
SCUMM: Make subtitle color change optional

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


diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index df76d944e8e..187a658d032 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -317,8 +317,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_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)},
+	{"freddi4", "",       0, GID_FREDDI4, 6, 98, MDT_NONE, GF_USE_KEY | GF_HE_985, UNK, GUIO5(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT, GUIO_AUDIO_OVERRIDE, GUIO_ENHANCEMENTS)},
+	{"freddi4", "unenc",  0, GID_FREDDI4, 6, 98, MDT_NONE,              GF_HE_985, UNK, GUIO5(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT, GUIO_AUDIO_OVERRIDE, GUIO_ENHANCEMENTS)},
 
 	// Humongous Entertainment Scumm Version 9.9 ?  Scummsys.99
 	{"football", 0, 0, GID_FOOTBALL, 6, 99, MDT_NONE, GF_USE_KEY, UNK, GUIO5(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT, GUIO_AUDIO_OVERRIDE, GUIO_NETWORK)},
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index a2638585e5f..a7124214af4 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -901,7 +901,7 @@ void ScummEngine_v72he::o72_actorOps() {
 		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)
+		if (_game.id == GID_FREDDI4 && _game.heversion == 98 && _currentRoom == 43 && a->_talkColor == 16 && _enableEnhancements)
 			a->_talkColor = 200;
 		break;
 	case SO_ACTOR_NAME:
@@ -2183,7 +2183,7 @@ void ScummEngine_v72he::decodeParseString(int m, int n) {
 			_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)
+			if (_game.id == GID_FREDDI4 && _game.heversion == 98 && _currentRoom == 43 && _string[m].color == 16 && _enableEnhancements)
 				_string[m].color = 200;
 		} else {
 			push(colors);