[Scummvm-git-logs] scummvm branch-2-8 -> cd37efaf882aa272997e431e9237b183207ac754

eriktorbjorn noreply at scummvm.org
Tue Mar 5 06:48:00 UTC 2024


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


Commit: cd37efaf882aa272997e431e9237b183207ac754
    https://github.com/scummvm/scummvm/commit/cd37efaf882aa272997e431e9237b183207ac754
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-03-05T07:47:35+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/gfx_mac.cpp


diff --git a/engines/scumm/gfx_mac.cpp b/engines/scumm/gfx_mac.cpp
index 158f0ba70be..4897ea1b84c 100644
--- a/engines/scumm/gfx_mac.cpp
+++ b/engines/scumm/gfx_mac.cpp
@@ -4174,6 +4174,9 @@ bool MacLoomGui::handleEvent(Common::Event &event) {
 	if (MacGui::handleEvent(event))
 		return true;
 
+	if (_vm->isPaused())
+		return false;
+
 	if (!_practiceBox || _vm->_userPut <= 0)
 		return false;
 
@@ -5985,6 +5988,9 @@ bool MacIndy3Gui::handleEvent(Common::Event &event) {
 	if (MacGui::handleEvent(event))
 		return true;
 
+	if (_vm->isPaused())
+		return false;
+
 	bool isPauseEvent = event.type == Common::EVENT_KEYDOWN &&
 		event.kbd == Common::KEYCODE_SPACE;
 




More information about the Scummvm-git-logs mailing list