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

[bluegr]

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:
bb38e39770 SCUMM: Fix crash with early Mac HE games


Commit: bb38e397700c6c258b13da7b1bd5fe654069c926
    https://github.com/scummvm/scummvm/commit/bb38e397700c6c258b13da7b1bd5fe654069c926
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2024-11-30T12:16:13+02:00

Commit Message:
SCUMM: Fix crash with early Mac HE games

Changed paths:
    engines/scumm/metaengine.cpp


diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index 0caf06fe0c1..b875ca1cd2e 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -411,7 +411,7 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine,
 	// TODO: Maybe allow the null driver, too?
 	if (res.game.platform == Common::kPlatformFMTowns && res.game.version == 3)
 		res.game.midi = MDT_TOWNS;
-	else if (res.game.platform == Common::kPlatformMacintosh && res.game.version < 7)
+	else if (res.game.platform == Common::kPlatformMacintosh && res.game.version < 7 && res.game.heversion == 0)
 		res.game.midi = MDT_MACINTOSH;
 
 	// Finally, we have massaged the GameDescriptor to our satisfaction, and can