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

[neuromancer]

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:
7f410de2c7 FREESCAPE: disable debug statement in drawFullscreenMessage
bca50cd100 FREESCAPE: reset events when the engine quits or returns to launcher


Commit: 7f410de2c73f718e3e33da342c3ad769ab66c5c5
    https://github.com/scummvm/scummvm/commit/7f410de2c73f718e3e33da342c3ad769ab66c5c5
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-01-16T09:40:13+01:00

Commit Message:
FREESCAPE: disable debug statement in drawFullscreenMessage

Changed paths:
    engines/freescape/ui.cpp


diff --git a/engines/freescape/ui.cpp b/engines/freescape/ui.cpp
index 8e6b9eca6c8..bc6e1bed8a5 100644
--- a/engines/freescape/ui.cpp
+++ b/engines/freescape/ui.cpp
@@ -172,7 +172,7 @@ void FreescapeEngine::drawFullscreenMessage(Common::String message, uint32 front
 
 	for (int i = 0; i < numberOfLines; i++) {
 		Common::String line = message.substr(letterPerLine * i, letterPerLine);
-		debug("'%s' %d", line.c_str(), line.size());
+		//debug("'%s' %d", line.c_str(), line.size());
 		drawStringInSurface(line, x, y, front, black, surface);
 		y = y + 8;
 	}


Commit: bca50cd10008353b71ce18c5c1a996bb46ed53f8
    https://github.com/scummvm/scummvm/commit/bca50cd10008353b71ce18c5c1a996bb46ed53f8
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-01-16T09:40:13+01:00

Commit Message:
FREESCAPE: reset events when the engine quits or returns to launcher

Changed paths:
    engines/freescape/events.cpp
    engines/freescape/freescape.cpp
    engines/freescape/freescape.h


diff --git a/engines/freescape/events.cpp b/engines/freescape/events.cpp
index ffef850f65f..5f9bb45ec72 100644
--- a/engines/freescape/events.cpp
+++ b/engines/freescape/events.cpp
@@ -89,4 +89,10 @@ void EventManagerWrapper::pushEvent(Common::Event &event) {
 	_delegate->pushEvent(event);
 }
 
+void EventManagerWrapper::clearExitEvents() {
+	_delegate->resetQuit();
+	_delegate->resetReturnToLauncher();
+
+}
+
 } // namespace Freescape
diff --git a/engines/freescape/freescape.cpp b/engines/freescape/freescape.cpp
index fc9c98c513c..c8795400a66 100644
--- a/engines/freescape/freescape.cpp
+++ b/engines/freescape/freescape.cpp
@@ -649,6 +649,7 @@ Common::Error FreescapeEngine::run() {
 		endGame = checkIfGameEnded();
 	}
 
+	_eventManager->clearExitEvents();
 	return Common::kNoError;
 }
 
diff --git a/engines/freescape/freescape.h b/engines/freescape/freescape.h
index e42dd10aaf8..2780eab2391 100644
--- a/engines/freescape/freescape.h
+++ b/engines/freescape/freescape.h
@@ -91,6 +91,7 @@ public:
 	void purgeKeyboardEvents();
 	void purgeMouseEvents();
 	void pushEvent(Common::Event &event);
+	void clearExitEvents();
 
 private:
 	// for continuous events (keyDown)