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

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e4be9c2b91 SCUMM: Fix crash adding the Mac Steam version of Loom
dc978759b0 SCUMM: Fix MI1 Mac cursor when loading certain saved games - bug #15520


Commit: e4be9c2b911851080d97844df22ee097d3f213a0
    https://github.com/scummvm/scummvm/commit/e4be9c2b911851080d97844df22ee097d3f213a0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-21T19:49:09+02:00

Commit Message:
SCUMM: Fix crash adding the Mac Steam version of Loom

Changed paths:
    engines/scumm/metaengine.cpp


diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index 86ddbea0e8d..fa354c6849a 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -601,8 +601,10 @@ GUI::OptionsContainerWidget *ScummMetaEngine::buildLoomOptionsWidget(GUI::GuiObj
 	if (extra == "VGA")
 		return new Scumm::LoomVgaGameOptionsWidget(boss, name, target);
 
-	if (extra == "Steam")
+	if (extra == "Steam" && platform != Common::kPlatformMacintosh)
 		return MetaEngine::buildEngineOptionsWidget(boss, name, target);
+	else if (extra == "Steam" && platform == Common::kPlatformMacintosh)
+		return nullptr;
 	else if (platform == Common::kPlatformMacintosh)
 		return new Scumm::LoomMonkeyMacGameOptionsWidget(boss, name, target, GID_LOOM);
 


Commit: dc978759b0629d620162e8e5c8c21c3fa7875ffb
    https://github.com/scummvm/scummvm/commit/dc978759b0629d620162e8e5c8c21c3fa7875ffb
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2024-11-21T19:49:10+02:00

Commit Message:
SCUMM: Fix MI1 Mac cursor when loading certain saved games - bug #15520

We need to reset Mac cursors if the original GUI isn't enabled for games
which replace cursors that override the default cursor palette.

Changed paths:
    engines/scumm/saveload.cpp


diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index d1b8afb9da2..295aa150196 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -2170,6 +2170,12 @@ void ScummEngine_v5::saveLoadWithSerializer(Common::Serializer &s) {
 		if ((_game.id == GID_LOOM && !_macCursorFile.empty()) || _macGui) {
 			setBuiltinCursor(0);
 		}
+
+		// Also reset Mac cursors if the original GUI isn't enabled for games
+		// which replace cursors that override the default cursor palette - bug #15520.
+		if (_game.id == GID_MONKEY && !_macGui) {
+			setBuiltinCursor(0);
+		}
 	}
 
 	// Regenerate 16bit palette after loading.