[Scummvm-git-logs] scummvm master -> 7f5da62d5806c1d5ebcf783c1bc523f3ca0acff4

[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:
7f5da62d58 SCUMM: MACGUI: Disable appropriate menus for v6-7 and Maniac Mansion


Commit: 7f5da62d5806c1d5ebcf783c1bc523f3ca0acff4
    https://github.com/scummvm/scummvm/commit/7f5da62d5806c1d5ebcf783c1bc523f3ca0acff4
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-01-09T07:13:36+01:00

Commit Message:
SCUMM: MACGUI: Disable appropriate menus for v6-7 and Maniac Mansion

Unlike earlier games, these games disable the entire Edit menu rather
than just the individual items. Maniac Mansion additionally disables the
Sound menu.

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


diff --git a/engines/scumm/macgui/macgui_v6.cpp b/engines/scumm/macgui/macgui_v6.cpp
index 225c779a97b..46be6e540f3 100644
--- a/engines/scumm/macgui/macgui_v6.cpp
+++ b/engines/scumm/macgui/macgui_v6.cpp
@@ -89,20 +89,17 @@ bool MacV6Gui::initialize() {
 	// same, at least!
 
 	Graphics::MacMenu *menu = _windowManager->getMenu();
+	Graphics::MacMenuItem *editMenu = menu->getMenuItem(2);
 	Graphics::MacMenuItem *videoMenu = menu->getMenuItem(3);
 
+	editMenu->enabled = false;
+
 	menu->getSubMenuItem(videoMenu, 0)->enabled = false; // Small
 	menu->getSubMenuItem(videoMenu, 1)->enabled = false; // Interlaced
 
 	if (_vm->_game.id == GID_MANIAC) {
 		Graphics::MacMenuItem *soundMenu = menu->getMenuItem(4);
-
-		menu->getSubMenuItem(soundMenu, 0)->enabled = false; // Music
-		menu->getSubMenuItem(soundMenu, 1)->enabled = false; // Effects
-		menu->getSubMenuItem(soundMenu, 3)->enabled = false; // Toggle Text & Voice
-		menu->getSubMenuItem(soundMenu, 5)->enabled = false; // Text Only
-		menu->getSubMenuItem(soundMenu, 6)->enabled = false; // Voice Only
-		menu->getSubMenuItem(soundMenu, 7)->enabled = false; // Text & Voice
+		soundMenu->enabled = false;
 	}
 
 	return true;