[Scummvm-git-logs] scummvm master -> 4ff09941248f07b10d44d18877b3af35f9b3cfe6

[eriktorbjorn]

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:
4ff0994124 SCUMM: Only allow Macintosh b/w render mode for Loom and Indy3


Commit: 4ff09941248f07b10d44d18877b3af35f9b3cfe6
    https://github.com/scummvm/scummvm/commit/4ff09941248f07b10d44d18877b3af35f9b3cfe6
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-07-14T07:32:43+02:00

Commit Message:
SCUMM: Only allow Macintosh b/w render mode for Loom and Indy3

And even then only when running them in hi-res mode.

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 1d0cc1b336..cb6c1de234 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -562,6 +562,12 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 			_renderMode = Common::kRenderDefault;
 		break;
 
+	case Common::kRenderMacintoshBW:
+		if (_game.platform != Common::kPlatformMacintosh || (_game.id != GID_LOOM && _game.id != GID_INDY3)) {
+			_renderMode = Common::kRenderDefault;
+		}
+		break;
+
 	default:
 		break;
 	}
@@ -1385,6 +1391,10 @@ Common::Error ScummEngine::init() {
 				dialog.runModal();
 			}
 		}
+
+		if (!_macScreen && _renderMode == Common::kRenderMacintoshBW) {
+			_renderMode = Common::kRenderDefault;
+		}
 	}
 
 	// Initialize backend