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

[eriktorbjorn]

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:
a9929f0aa6 SCUMM: Fix Mac Loom/Indy3 crash when running without original GUI
b2cb32202e SCUMM: Make Mac Loom Drafts Inventory menu item an enhancement too


Commit: a9929f0aa62b2c134cdc982785b6ccd7a18e5447
    https://github.com/scummvm/scummvm/commit/a9929f0aa62b2c134cdc982785b6ccd7a18e5447
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-11-28T18:35:21+01:00

Commit Message:
SCUMM: Fix Mac Loom/Indy3 crash when running without original GUI

Changed paths:
    engines/scumm/gfx_mac.cpp


diff --git a/engines/scumm/gfx_mac.cpp b/engines/scumm/gfx_mac.cpp
index 2134ee4ddf0..518fe198df2 100644
--- a/engines/scumm/gfx_mac.cpp
+++ b/engines/scumm/gfx_mac.cpp
@@ -2660,6 +2660,11 @@ bool MacGui::handleMenu(int id, Common::String &name) {
 }
 
 void MacGui::updateWindowManager() {
+	Graphics::MacMenu *menu = _windowManager->getMenu();
+
+	if (!menu)
+		return;
+
 	// We want the arrow cursor for menus. Note that the menu triggers even
 	// when the mouse is invisible, which may or may not be a bug. But the
 	// original did allow you to open the menu with Alt even when the
@@ -2695,9 +2700,9 @@ void MacGui::updateWindowManager() {
 	bool canLoad = _vm->canLoadGameStateCurrently() && saveCondition;
 	bool canSave = _vm->canSaveGameStateCurrently() && loadCondition;
 
-	Graphics::MacMenuItem *gameMenu = _windowManager->getMenu()->getMenuItem("Game");
-	Graphics::MacMenuItem *loadMenu = _windowManager->getMenu()->getSubMenuItem(gameMenu, 0);
-	Graphics::MacMenuItem *saveMenu = _windowManager->getMenu()->getSubMenuItem(gameMenu, 1);
+	Graphics::MacMenuItem *gameMenu = menu->getMenuItem("Game");
+	Graphics::MacMenuItem *loadMenu = menu->getSubMenuItem(gameMenu, 0);
+	Graphics::MacMenuItem *saveMenu = menu->getSubMenuItem(gameMenu, 1);
 
 	loadMenu->enabled = canLoad;
 	saveMenu->enabled = canSave;


Commit: b2cb32202e47f3fae497f839c2c002ff492a4c1f
    https://github.com/scummvm/scummvm/commit/b2cb32202e47f3fae497f839c2c002ff492a4c1f
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2023-11-28T18:38:08+01:00

Commit Message:
SCUMM: Make Mac Loom Drafts Inventory menu item an enhancement too

But to make sure we keep the same menu item IDs, we only disable it. We
don't remove it completely.

Changed paths:
    engines/scumm/gfx_mac.cpp


diff --git a/engines/scumm/gfx_mac.cpp b/engines/scumm/gfx_mac.cpp
index 518fe198df2..f05d3726d96 100644
--- a/engines/scumm/gfx_mac.cpp
+++ b/engines/scumm/gfx_mac.cpp
@@ -2533,8 +2533,14 @@ void MacGui::initialize() {
 		// TODO: This can be found in the STRS resource
 		Common::String aboutMenuDef = "About " + name() + "...<B;(-";
 
-		if (_vm->_game.id == GID_LOOM)
-			aboutMenuDef += ";Drafts Inventory";
+		if (_vm->_game.id == GID_LOOM) {
+			aboutMenuDef += ";";
+
+			if (!_vm->enhancementEnabled(kEnhUIUX))
+				aboutMenuDef += "(";
+
+			aboutMenuDef += "Drafts Inventory";
+		}
 
 		menu->addStaticMenus(menuSubItems);
 		menu->createSubMenuFromString(0, aboutMenuDef.c_str(), 0);