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

[mduggan]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
219ccd21f8 TETRAEDGE: Do not show GUI confirmation dialog
5eed5c6dbd TETRAEDGE: Do not call quitGame() when receiving a QUIT or RTL event


Commit: 219ccd21f86b4b5078eb51c1fcb9eca5e26a7b73
    https://github.com/scummvm/scummvm/commit/219ccd21f86b4b5078eb51c1fcb9eca5e26a7b73
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2023-03-21T08:13:58+09:00

Commit Message:
TETRAEDGE: Do not show GUI confirmation dialog

Syberia has its own confirmation dialog. Syberia 2 does not seem
to ask for confirmation, but using the GUI confirmation does not
work anyway as if the user decides not to quit after all, we end
up with a black screen.

Changed paths:
    engines/tetraedge/tetraedge.h


diff --git a/engines/tetraedge/tetraedge.h b/engines/tetraedge/tetraedge.h
index 45f06281d9e..3977eed6c4d 100644
--- a/engines/tetraedge/tetraedge.h
+++ b/engines/tetraedge/tetraedge.h
@@ -104,7 +104,8 @@ public:
 			(f == kSupportsLoadingDuringRuntime) ||
 			(f == kSupportsSavingDuringRuntime) ||
 			(f == kSupportsReturnToLauncher) ||
-			(f == kSupportsChangingOptionsDuringRuntime);
+			(f == kSupportsChangingOptionsDuringRuntime) ||
+			(f == kSupportsQuitDialogOverride);
 	};
 
 	bool canLoadGameStateCurrently() override;


Commit: 5eed5c6dbd4bf0d7499dd631a24e0e2e36eae301
    https://github.com/scummvm/scummvm/commit/5eed5c6dbd4bf0d7499dd631a24e0e2e36eae301
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2023-03-21T08:13:58+09:00

Commit Message:
TETRAEDGE: Do not call quitGame() when receiving a QUIT or RTL event

The only thing that quitGame() does is to send a new QUIT event, but
we already have one. So this is unnecessary. Furthermore this causes
an infinite loop in the case of a RTL event if the option to return
to the launcher on quit is on. Indeed  DefaultEventManager::pushEvent()
has a check in the case of a QUIT_EVENT to ignore it if it already
received one, which avoids the infinite loop, unless the QUIT_EVENT
are converted to RTL events.

This fixes bug #14328 and #14329.

Changed paths:
    engines/tetraedge/te/te_input_mgr.cpp


diff --git a/engines/tetraedge/te/te_input_mgr.cpp b/engines/tetraedge/te/te_input_mgr.cpp
index 0be590a84eb..84c6f4b1f40 100644
--- a/engines/tetraedge/te/te_input_mgr.cpp
+++ b/engines/tetraedge/te/te_input_mgr.cpp
@@ -59,10 +59,6 @@ void TeInputMgr::handleEvent(const Common::Event &e) {
 		case Common::EVENT_MAINMENU:
 			g_engine->getGame()->_returnToMainMenu = true;
 			break;
-		case Common::EVENT_RETURN_TO_LAUNCHER:
-		case Common::EVENT_QUIT:
-			g_engine->quitGame();
-			break;
 		default:
 			break;
 	}