[Scummvm-git-logs] scummvm master -> 9b82d3b751b8efe10e7b3b5250e27a95b67d862d

mgerhardy noreply at scummvm.org
Mon Oct 14 18:07:38 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:
9b82d3b751 TWINE: don't allow to bring up menus if we are in palette fading mode


Commit: 9b82d3b751b8efe10e7b3b5250e27a95b67d862d
    https://github.com/scummvm/scummvm/commit/9b82d3b751b8efe10e7b3b5250e27a95b67d862d
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2024-10-14T20:06:13+02:00

Commit Message:
TWINE: don't allow to bring up menus if we are in palette fading mode

Changed paths:
    engines/twine/twine.cpp


diff --git a/engines/twine/twine.cpp b/engines/twine/twine.cpp
index 6e9471f571b..9a655efd836 100644
--- a/engines/twine/twine.cpp
+++ b/engines/twine/twine.cpp
@@ -917,7 +917,7 @@ bool TwinEEngine::runGameEngine() { // mainLoopInteration
 		if (_input->toggleAbortAction()) {
 			return true;
 		}
-	} else {
+	} else if (_screens->_flagFade) {
 		// Process give up menu - Press ESC
 		if (_input->toggleAbortAction() && _scene->_sceneHero->_lifePoint > 0 && _scene->_sceneHero->_body != -1 && !_scene->_sceneHero->_staticFlags.bIsInvisible) {
 			saveTimer(false);




More information about the Scummvm-git-logs mailing list