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

[athrxx]

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:
c282769fae SCUMM: Allow using the Amiga render for Indy3 EGA (Trac#15227)


Commit: c282769fae4383167fe8fa1e0affba067b8eac10
    https://github.com/scummvm/scummvm/commit/c282769fae4383167fe8fa1e0affba067b8eac10
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-08-02T18:53:08+02:00

Commit Message:
SCUMM: Allow using the Amiga render for Indy3 EGA (Trac#15227)

It makes sense to allow using the Amiga render option for Indy3 EGA, as it's
already quite popular to do so for Maniac Mansion and Zak in order to avoid
the so-called "sunburnt effect", and also for personal palette preferences.

Then, the question is also open for Loom EGA and Monkey1 EGA, maybe?

See similar commit 4586d2fc9df145492ab9e62f7d47c03b8f271944 for V2 games.

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


diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 1def5f75af6..5cb5fc24013 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -169,7 +169,7 @@ static const GameSettings gameVariantsTable[] = {
 	{"indyloom", "FM-TOWNS",    0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GAMEOPTION_TRIM_FMTOWNS_TO_200_PIXELS, GAMEOPTION_ORIGINALGUI)},
 	{"indyzak", "FM-TOWNS",    0, GID_ZAK, 3, 0, MDT_TOWNS, GF_OLD256 | GF_AUDIOTRACKS, Common::kPlatformFMTowns, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_MIDITOWNS, GAMEOPTION_TRIM_FMTOWNS_TO_200_PIXELS, GAMEOPTION_ORIGINALGUI)},
 
-	{"indy3", "EGA",      "ega", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB, 0, UNK, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERCGA, GAMEOPTION_ENHANCEMENTS, GAMEOPTION_ORIGINALGUI)},
+	{"indy3", "EGA",      "ega", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB, 0, UNK, GUIO6(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERCGA, GUIO_RENDERAMIGA, GAMEOPTION_ENHANCEMENTS, GAMEOPTION_ORIGINALGUI)},
 	{"indy3", "Mac",      "ega", GID_INDY3, 3, 0, MDT_MACINTOSH,             0, Common::kPlatformMacintosh, GUIO6(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERMACINTOSHBW, GAMEOPTION_ENHANCEMENTS, GAMEOPTION_ORIGINALGUI, GUIO_NOASPECT)},
 	{"indy3", "No AdLib", "ega", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR,             0, UNK, GUIO5(GUIO_NOSPEECH, GUIO_NOMIDI, GUIO_RENDERCGA, GAMEOPTION_ENHANCEMENTS, GAMEOPTION_ORIGINALGUI)},
 	{"indy3", "VGA",      "vga", GID_INDY3, 3, 0, MDT_PCSPK | MDT_PCJR | MDT_CMS | MDT_ADLIB, GF_OLD256 | GF_FEW_LOCALS,                  Common::kPlatformDOS, GUIO4(GUIO_NOSPEECH, GUIO_NOMIDI, GAMEOPTION_ENHANCEMENTS, GAMEOPTION_ORIGINALGUI)},
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 6555cc4a5f9..ca795e525a0 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -317,7 +317,9 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 	case Common::kRenderAmiga:
 		// Allow v2 games to be rendered in forced Amiga mode; this works, and
 		// doing this to avoid the "sunburn effect" in MM/Zak is popular.
-		if (_game.platform != Common::kPlatformAmiga && _game.version != 2)
+		// Also allow this for Indy3 EGA.
+		if (_game.platform != Common::kPlatformAmiga && _game.version != 2 &&
+(_game.version != 3 || _game.id != GID_INDY3 || _game.platform == Common::kPlatformMacintosh))
 			_renderMode = Common::kRenderDefault;
 		break;