[Scummvm-git-logs] scummvm master -> 1ebd6e11c6b5ad8f98da2817c10e8a33ce23e138

[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:
1ebd6e11c6 SCUMM: MACGUI: Make the "rough" command for MI1 an enhancement


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

Commit Message:
SCUMM: MACGUI: Make the "rough" command for MI1 an enhancement

Since MI1 doesn't have the string for the warning message, hard-code one
if it's missing.

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


diff --git a/engines/scumm/macgui/macgui_v5.cpp b/engines/scumm/macgui/macgui_v5.cpp
index ce32b29c85d..c06a8194685 100644
--- a/engines/scumm/macgui/macgui_v5.cpp
+++ b/engines/scumm/macgui/macgui_v5.cpp
@@ -932,9 +932,11 @@ bool MacV5Gui::handleEvent(Common::Event event) {
 	if (_vm->isPaused())
 		return false;
 
-	const char *rough = "rough";
+	bool checkRough = (_vm->_game.id != GID_MONKEY || _vm->enhancementEnabled(kEnhUIUX));
+
+	if (checkRough && event.type == Common::EVENT_KEYDOWN) {
+		const char *rough = "rough";
 
-	if (event.type == Common::EVENT_KEYDOWN) {
 		if (event.kbd.keycode == rough[_roughProgress]) {
 			_roughProgress++;
 			if (_roughProgress >= strlen(rough)) {
@@ -942,7 +944,12 @@ bool MacV5Gui::handleEvent(Common::Event event) {
 				if (_vm->_useMacGraphicsSmoothing && !_roughWarned) {
 					_roughWarned = true;
 
-					if (!_strsStrings[kMSIRoughCommandMsg].empty() && !runOkCancelDialog(_strsStrings[kMSIRoughCommandMsg]))
+					Common::String msg = _strsStrings[kMSIRoughCommandMsg];
+
+					if (msg.empty())
+						msg = "Warning: The 'rough' command will make your Mac screen look dangerously like a PC.  (eek!)";
+
+					if (!runOkCancelDialog(msg))
 						return false;
 				}
 				_vm->mac_toggleSmoothing();