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

[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:
f3a510debb SCUMM: MACGUI: Make the "Graphics Smoothing" menu item an enhancement


Commit: f3a510debb8f67ae646653de29a5d7db96364a79
    https://github.com/scummvm/scummvm/commit/f3a510debb8f67ae646653de29a5d7db96364a79
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-10-31T19:18:47+01:00

Commit Message:
SCUMM: MACGUI: Make the "Graphics Smoothing" menu item an enhancement

Of MI1, MI2 and Fate of Atlantis, only the CD version of Fate of
Atlantis has this menu item. Also removed the shortcut key from it to be
consistent with the FoA, and also because the shortcut key interfered
with an existing shortcut key.

Changed paths:
    engines/scumm/macgui/macgui_impl.cpp


diff --git a/engines/scumm/macgui/macgui_impl.cpp b/engines/scumm/macgui/macgui_impl.cpp
index 2a64b5682c1..9f5659f5809 100644
--- a/engines/scumm/macgui/macgui_impl.cpp
+++ b/engines/scumm/macgui/macgui_impl.cpp
@@ -229,13 +229,20 @@ void MacGuiImpl::initialize() {
 			Common::String string = menuDef->operator[](1);
 			int id = menu->addMenuItem(nullptr, name);
 
-			if ((_vm->_game.id == GID_MONKEY || _vm->_game.id == GID_MONKEY2) && id == 3) {
-				string += ";(-;Smooth Graphics/G";
-			}
+			// The CD version of Fate of Atlantis has a menu item
+			// for toggling graphics smoothing. We retroactively
+			// add that to the remaining V5 games, but not to
+			// Loom and Last Crusade.
+
+			if (_vm->enhancementEnabled(kEnhUIUX)) {
+				if ((_vm->_game.id == GID_MONKEY || _vm->_game.id == GID_MONKEY2) && id == 3) {
+					string += ";(-;Smooth Graphics";
+				}
 
-			// Floppy version
-			if (_vm->_game.id == GID_INDY4 && !string.contains("Smooth Graphics") && id == 3) {
-				string += ";(-;Smooth Graphics/G";
+				// Floppy version
+				if (_vm->_game.id == GID_INDY4 && !string.contains("Smooth Graphics") && id == 3) {
+					string += ";(-;Smooth Graphics";
+				}
 			}
 
 			menu->createSubMenuFromString(id, string.c_str(), 0);
@@ -449,7 +456,8 @@ void MacGuiImpl::updateWindowManager() {
 		menu->getSubMenuItem(windowMenu, 4)->enabled = false;
 		menu->getSubMenuItem(windowMenu, 5)->enabled = false;
 
-		menu->getSubMenuItem(windowMenu, 7)->checked = _vm->_useMacGraphicsSmoothing;
+		if (menu->numberOfMenuItems(windowMenu) >= 8)
+			menu->getSubMenuItem(windowMenu, 7)->checked = _vm->_useMacGraphicsSmoothing;
 
 		Graphics::MacMenuItem *speechMenu = menu->getMenuItem("Speech");