[Scummvm-git-logs] scummvm master -> 7e6bd5459a51b9bd7ca3b52685c9a2392cec0c78

[bluegr]

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

Summary:
3d91afcb52 NANCY: Reset the previous state and enable mouse when loading
7e6bd5459a NANCY: Call the correct superclass constructor in quizpuzzle


Commit: 3d91afcb52ed8c4c628de23772baf0d351cd77c3
    https://github.com/scummvm/scummvm/commit/3d91afcb52ed8c4c628de23772baf0d351cd77c3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-15T08:50:30+03:00

Commit Message:
NANCY: Reset the previous state and enable mouse when loading

Fix #16779

Changed paths:
    engines/nancy/nancy.cpp


diff --git a/engines/nancy/nancy.cpp b/engines/nancy/nancy.cpp
index c46413a5442..f965a26249d 100644
--- a/engines/nancy/nancy.cpp
+++ b/engines/nancy/nancy.cpp
@@ -116,8 +116,12 @@ Common::Error NancyEngine::loadGameState(int slot) {
 	}
 
 	Common::Error result = Engine::loadGameState(slot);
-	if (result.getCode() == Common::kNoError)
+	if (result.getCode() == Common::kNoError) {
+		if (_gameFlow.curState != NancyState::kScene)
+			destroyState(_gameFlow.curState);
 		g_nancy->setState(NancyState::kScene);
+		g_nancy->setMouseEnabled(true);
+	}
 	return result;
 }
 


Commit: 7e6bd5459a51b9bd7ca3b52685c9a2392cec0c78
    https://github.com/scummvm/scummvm/commit/7e6bd5459a51b9bd7ca3b52685c9a2392cec0c78
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-15T08:50:31+03:00

Commit Message:
NANCY: Call the correct superclass constructor in quizpuzzle

Changed paths:
    engines/nancy/action/puzzle/quizpuzzle.cpp


diff --git a/engines/nancy/action/puzzle/quizpuzzle.cpp b/engines/nancy/action/puzzle/quizpuzzle.cpp
index f1b7228c30f..71202ea73b7 100644
--- a/engines/nancy/action/puzzle/quizpuzzle.cpp
+++ b/engines/nancy/action/puzzle/quizpuzzle.cpp
@@ -48,7 +48,7 @@ void QuizPuzzle::init() {
 	setTransparent(true);
 
 	g_nancy->_input->setVKEnabled(true);
-	RenderObject::init();
+	RenderActionRecord::init();
 }
 
 Common::String QuizPuzzle::readSubtitle(Common::SeekableReadStream &stream) {