[Scummvm-git-logs] scummvm master -> 5bc34ba1776eae0099402beef5981d761b1e5295

[bluegr]

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:
5bc34ba177 SCUMM: MACGUI: Disable Maniac Mansion Mac GUI while paused


Commit: 5bc34ba1776eae0099402beef5981d761b1e5295
    https://github.com/scummvm/scummvm/commit/5bc34ba1776eae0099402beef5981d761b1e5295
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-03-03T11:29:05+02:00

Commit Message:
SCUMM: MACGUI: Disable Maniac Mansion Mac GUI while paused

We do this by setting the _messageBannerActive flag. It's not really a
banner, I guess, but close enough. Also simplified the check a bit. Back
when it was just Loom and Indy 3, we checked if their custom banner
window had been created. But the message banner flag actually covers
that as well.

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


diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index 5767e5eff05..cb9021b00c0 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -333,6 +333,8 @@ Common::KeyState ScummEngine::printMessageAndPause(const char *msg, int color, i
 	int pixelYOffset = (_game.platform == Common::kPlatformC64) ? 1 : 0;
 	int pixelXOffset = (_game.platform == Common::kPlatformC64) ? 1 : 0;
 
+	_messageBannerActive = true;
+
 	// Pause the engine
 	PauseToken pt = pauseEngine();
 
@@ -435,6 +437,8 @@ Common::KeyState ScummEngine::printMessageAndPause(const char *msg, int color, i
 	pt.clear();
 	clearClickedStatus();
 
+	_messageBannerActive = false;
+
 	return ks;
 }
 
diff --git a/engines/scumm/macgui/macgui_impl.cpp b/engines/scumm/macgui/macgui_impl.cpp
index 0d6b3541d5a..daa8be4af68 100644
--- a/engines/scumm/macgui/macgui_impl.cpp
+++ b/engines/scumm/macgui/macgui_impl.cpp
@@ -115,9 +115,7 @@ bool MacGuiImpl::handleEvent(Common::Event event) {
 	// The situation we're trying to avoid here is the user opening e.g.
 	// the save dialog using keyboard shortcuts while the game is paused.
 
-	// TODO: We need something for Maniac Mansion here
-
-	if (_bannerWindow || _vm->_messageBannerActive)
+	if (_vm->_messageBannerActive)
 		return false;
 
 	return _windowManager->processEvent(event);