[Scummvm-git-logs] scummvm master -> 442ca7d724a0fe3342108e3ccb042e22a7a313e0

[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:
442ca7d724 SCUMM: (v6) - allow EGA mode for <default> platform


Commit: 442ca7d724a0fe3342108e3ccb042e22a7a313e0
    https://github.com/scummvm/scummvm/commit/442ca7d724a0fe3342108e3ccb042e22a7a313e0
Author: athrxx (athrxx at scummvm.org)
Date: 2022-08-21T16:41:49+02:00

Commit Message:
SCUMM: (v6) - allow EGA mode for <default> platform

Currently it is allowed only for DOS platform settings, but for the v6 games this is the same thing...

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index eb00b2db88e..de0c60ada8c 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -252,7 +252,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 		GID_MONKEY2			// Support in the original interpreter.
 	};
 
-	_supportsEGADithering = (_game.platform == Common::kPlatformDOS && _game.version > 3 && Common::find(egaModeIDs, &egaModeIDs[ARRAYSIZE(egaModeIDs)], _game.id) != &egaModeIDs[ARRAYSIZE(egaModeIDs)]);
+	_supportsEGADithering = ((_game.version == 6 || (_game.version > 3 && _game.platform == Common::kPlatformDOS)) && Common::find(egaModeIDs, &egaModeIDs[ARRAYSIZE(egaModeIDs)], _game.id) != &egaModeIDs[ARRAYSIZE(egaModeIDs)]);
 
 	if (_game.platform == Common::kPlatformFMTowns && _game.id != GID_LOOM && _game.version == 3)
 		if (ConfMan.getBool("aspect_ratio") && !ConfMan.getBool("trim_fmtowns_to_200_pixels")) {
@@ -278,7 +278,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 	case Common::kRenderCGA:
 	case Common::kRenderEGA:
 		if ((_game.version >= 4 && !(_game.features & GF_16COLOR) && !_supportsEGADithering)
-			|| (_game.features & GF_OLD256) || _game.platform != Common::kPlatformDOS)
+			|| (_game.features & GF_OLD256) || (_game.platform != Common::kPlatformDOS && !_supportsEGADithering))
 			_renderMode = Common::kRenderDefault;
 		break;