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

[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:
c9456d511b SCUMM: MACGUI: Move handlers for V5 menu items to MacV5Gui


Commit: c9456d511b6008da447a8d895c9d520613ca3325
    https://github.com/scummvm/scummvm/commit/c9456d511b6008da447a8d895c9d520613ca3325
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-10-30T18:07:03+01:00

Commit Message:
SCUMM: MACGUI: Move handlers for V5 menu items to MacV5Gui

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


diff --git a/engines/scumm/macgui/macgui_impl.cpp b/engines/scumm/macgui/macgui_impl.cpp
index e42134649d6..2a64b5682c1 100644
--- a/engines/scumm/macgui/macgui_impl.cpp
+++ b/engines/scumm/macgui/macgui_impl.cpp
@@ -359,35 +359,6 @@ bool MacGuiImpl::handleMenu(int id, Common::String &name) {
 	case 303:	// Paste
 	case 304:	// Clear
 		return true;
-
-	// Window menu
-	case 402: // Tiny
-	case 403: // Medium
-	case 404: // Large
-		return true;
-
-	case 405: // Graphics Smoothing
-		_vm->mac_toggleSmoothing();
-		return true;
-
-	case 500: // Voice Only
-		ConfMan.setBool("subtitles", false);
-		ConfMan.setBool("speech_mute", false);
-		ConfMan.flushToDisk();
-		_vm->syncSoundSettings();
-		return true;
-	case 501: // Text Only
-		ConfMan.setBool("subtitles", true);
-		ConfMan.setBool("speech_mute", true);
-		ConfMan.flushToDisk();
-		_vm->syncSoundSettings();
-		return true;
-	case 502: // Voice and Text
-		ConfMan.setBool("subtitles", true);
-		ConfMan.setBool("speech_mute", false);
-		ConfMan.flushToDisk();
-		_vm->syncSoundSettings();
-		return true;
 	}
 
 	return false;
diff --git a/engines/scumm/macgui/macgui_v5.cpp b/engines/scumm/macgui/macgui_v5.cpp
index 69d18b539a0..ce32b29c85d 100644
--- a/engines/scumm/macgui/macgui_v5.cpp
+++ b/engines/scumm/macgui/macgui_v5.cpp
@@ -147,6 +147,37 @@ bool MacV5Gui::handleMenu(int id, Common::String &name) {
 			_vm->quitGame();
 		break;
 
+	// Window menu
+	case 402: // Tiny
+	case 403: // Medium
+	case 404: // Large
+		return true;
+
+	case 405: // Graphics Smoothing
+		_vm->mac_toggleSmoothing();
+		return true;
+
+	case 500: // Voice Only
+		ConfMan.setBool("subtitles", false);
+		ConfMan.setBool("speech_mute", false);
+		ConfMan.flushToDisk();
+		_vm->syncSoundSettings();
+		return true;
+
+	case 501: // Text Only
+		ConfMan.setBool("subtitles", true);
+		ConfMan.setBool("speech_mute", true);
+		ConfMan.flushToDisk();
+		_vm->syncSoundSettings();
+		return true;
+
+	case 502: // Voice and Text
+		ConfMan.setBool("subtitles", true);
+		ConfMan.setBool("speech_mute", false);
+		ConfMan.flushToDisk();
+		_vm->syncSoundSettings();
+		return true;
+
 	default:
 		warning("Unknown menu command: %d", id);
 		break;