[Scummvm-git-logs] scummvm master -> 7572817b963af1e4e5fb57e0dbfc13cb953fd6a3

[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:
7572817b96 SCUMM: Use GMM instead of original screen in Mac Maniac Mansion


Commit: 7572817b963af1e4e5fb57e0dbfc13cb953fd6a3
    https://github.com/scummvm/scummvm/commit/7572817b963af1e4e5fb57e0dbfc13cb953fd6a3
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-02-02T06:35:19+01:00

Commit Message:
SCUMM: Use GMM instead of original screen in Mac Maniac Mansion

The original save/load screen handles only a single save slot, which
doesn't align with how we handle saving and loading through the Mac
dialogs.

Changed paths:
    engines/scumm/input.cpp


diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 7c01cf2dfb6..dcbf0df640b 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -983,7 +983,6 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) {
 		restartKeyEnabled = true;
 
 	if (isUsingOriginalGUI()) {
-
 		if (lastKeyHit.keycode == Common::KEYCODE_F5 && _game.version <= 3) {
 			_savegameThumbnail.free();
 			Graphics::createThumbnail(_savegameThumbnail);
@@ -1202,8 +1201,10 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) {
 		} else if (lastKeyHit.keycode == Common::KEYCODE_F5 && isNES) {
 			// We map the GMM to F5, while SPACE (which acts as our pause button) calls the original menu...
 			openMainMenuDialog();
-		} else if (lastKeyHit.keycode == Common::KEYCODE_F5 && _game.version == 3 && _game.platform == Common::kPlatformMacintosh) {
-			// We don't have original menus for Mac versions of LOOM and INDY3, so let's just open the GMM...
+		} else if (lastKeyHit.keycode == Common::KEYCODE_F5 && _game.version <= 3 && _game.platform == Common::kPlatformMacintosh) {
+			// We don't have original menus for Mac versions of LOOM and INDY3,
+			// and Maniac Mansion's save/load screen doesn't align with how we
+			// handle saving and loading so let's just open the GMM...
 			openMainMenuDialog();
 			return;
 		}