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

[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:
ed883f7957 SCUMM: Don't handle Mac GUI events while the game is paused


Commit: ed883f795795bdabd5f5d55d290ce2580011c4b9
    https://github.com/scummvm/scummvm/commit/ed883f795795bdabd5f5d55d290ce2580011c4b9
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-03-05T07:42:45+01:00

Commit Message:
SCUMM: Don't handle Mac GUI events while the game is paused

At least for Indy 3, it led to strange effects with verb buttons being
depressed but not popping back out. For Loom, it made it possible to
move the practice box while the game was paused. While that's not
necessarily bad, I really don't want to have to worry about what else
may happen.

Changed paths:
    engines/scumm/macgui/macgui_indy3.cpp
    engines/scumm/macgui/macgui_loom.cpp


diff --git a/engines/scumm/macgui/macgui_indy3.cpp b/engines/scumm/macgui/macgui_indy3.cpp
index e67a6abfe00..3397ee4bd28 100644
--- a/engines/scumm/macgui/macgui_indy3.cpp
+++ b/engines/scumm/macgui/macgui_indy3.cpp
@@ -1743,6 +1743,9 @@ bool MacIndy3Gui::handleEvent(Common::Event event) {
 	if (MacGuiImpl::handleEvent(event))
 		return true;
 
+	if (_vm->isPaused())
+		return false;
+
 	bool isPauseEvent = event.type == Common::EVENT_KEYDOWN &&
 		event.kbd == Common::KEYCODE_SPACE;
 
diff --git a/engines/scumm/macgui/macgui_loom.cpp b/engines/scumm/macgui/macgui_loom.cpp
index 93fce2cb5f9..6bc3e9951de 100644
--- a/engines/scumm/macgui/macgui_loom.cpp
+++ b/engines/scumm/macgui/macgui_loom.cpp
@@ -842,6 +842,9 @@ bool MacLoomGui::handleEvent(Common::Event event) {
 	if (MacGuiImpl::handleEvent(event))
 		return true;
 
+	if (_vm->isPaused())
+		return false;
+
 	if (!_practiceBox || _vm->_userPut <= 0)
 		return false;