[Scummvm-git-logs] scummvm master -> 152ebfab72e55072ea7ccadb507bb9471724db34

[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:
152ebfab72 SCUMM: INDY3: Fix Steam Mac version being detected as an actual Mac version


Commit: 152ebfab72e55072ea7ccadb507bb9471724db34
    https://github.com/scummvm/scummvm/commit/152ebfab72e55072ea7ccadb507bb9471724db34
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-12-10T12:55:12+01:00

Commit Message:
SCUMM: INDY3: Fix Steam Mac version being detected as an actual Mac version

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 628fb0ba1ff..a9de92a7c71 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -340,6 +340,9 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 		break;
 	}
 
+	// Steam Win and Mac versions share the same DOS data files.
+	bool isSteamVersion = Common::String(_game.preferredTag).equalsIgnoreCase("steam");
+
 	if (_game.platform == Common::kPlatformFMTowns && _game.version == 3) {	// FM-TOWNS V3 games originally use 320x240, and we have an option to trim to 200
 		_screenWidth = 320;
 		if (ConfMan.getBool("trim_fmtowns_to_200_pixels"))
@@ -354,7 +357,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 	} else if (_game.platform == Common::kPlatformNES) {
 		_screenWidth = 256;
 		_screenHeight = 240;
-	} else if (_useMacScreenCorrectHeight && _game.platform == Common::kPlatformMacintosh && _game.version == 3) {
+	} else if (!isSteamVersion && _useMacScreenCorrectHeight && _game.platform == Common::kPlatformMacintosh && _game.version == 3) {
 		_screenWidth = 320;
 		_screenHeight = 240;
 		_screenDrawOffset = 20;