[Scummvm-git-logs] scummvm master -> 0b65b3f26686d38e88b3cd9ab36379b4fd8690a4

[bluegr]

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

Summary:
0b65b3f266 NANCY: Fix compilation


Commit: 0b65b3f26686d38e88b3cd9ab36379b4fd8690a4
    https://github.com/scummvm/scummvm/commit/0b65b3f26686d38e88b3cd9ab36379b4fd8690a4
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-02T11:54:03+03:00

Commit Message:
NANCY: Fix compilation

Changed paths:
    engines/nancy/action/actionmanager.cpp
    engines/nancy/console.cpp
    engines/nancy/nancy.cpp
    engines/nancy/state/scene.h


diff --git a/engines/nancy/action/actionmanager.cpp b/engines/nancy/action/actionmanager.cpp
index a29aa76e931..c22e8063bcf 100644
--- a/engines/nancy/action/actionmanager.cpp
+++ b/engines/nancy/action/actionmanager.cpp
@@ -263,7 +263,7 @@ void ActionManager::processActionRecords() {
 			activeRecordsThisFrame = true;
 		}
 
-		if (g_nancy->getGameType() >= kGameTypeNancy4 && NancySceneState._state == State::Scene::kLoad) {
+		if (g_nancy->getGameType() >= kGameTypeNancy4 && NancySceneState.getState() == State::Scene::kLoad) {
 			// changeScene() must have been called, abort any further processing.
 			// Both old and new behavior is needed (nancy3 intro narration, nancy4 garden gate)
 			return;
diff --git a/engines/nancy/console.cpp b/engines/nancy/console.cpp
index e3157ca778a..192798a15d0 100644
--- a/engines/nancy/console.cpp
+++ b/engines/nancy/console.cpp
@@ -466,7 +466,7 @@ bool NancyConsole::Cmd_loadScene(int argc, const char **argv) {
 	SceneChangeDescription scene;
 	scene.sceneID = (uint16)atoi(argv[1]);
 	NancySceneState.changeScene(scene);
-	NancySceneState._state = State::Scene::kLoad;
+	NancySceneState.setState(State::Scene::kLoad);
 	delete iff;
 	return cmdExit(0, nullptr);
 }
diff --git a/engines/nancy/nancy.cpp b/engines/nancy/nancy.cpp
index a6e91011fc7..282f1f1903a 100644
--- a/engines/nancy/nancy.cpp
+++ b/engines/nancy/nancy.cpp
@@ -138,7 +138,7 @@ bool NancyEngine::canLoadGameStateCurrently(Common::U32String *msg) {
 
 bool NancyEngine::canSaveGameStateCurrently(Common::U32String *msg) {
 	return State::Scene::hasInstance() &&
-			NancySceneState._state == State::Scene::kRun &&
+		   NancySceneState.getState() == State::Scene::kRun &&
 			NancySceneState.getActiveConversation() == nullptr &&
 			NancySceneState.getActiveMovie() == nullptr &&
 			!NancySceneState.isRunningAd();
@@ -151,7 +151,7 @@ void NancyEngine::secondChance() {
 
 void NancyEngine::errorString(const char *buf_input, char *buf_output, int buf_output_size) {
 	if (State::Scene::hasInstance()) {
-		if (NancySceneState._state == State::Scene::kLoad) {
+		if (NancySceneState.getState() == State::Scene::kLoad) {
 			// Error while loading scene
 			snprintf(buf_output, buf_output_size, "While loading scene S%u, frame %u, action record %u:\n%s",
 				NancySceneState.getSceneInfo().sceneID,
@@ -711,7 +711,7 @@ Common::Error NancyEngine::synchronize(Common::Serializer &ser) {
 
 	// Sync scene and action records
 	NancySceneState.synchronize(ser);
-	NancySceneState._actionManager.synchronize(ser);
+	NancySceneState.getActionManager().synchronize(ser);
 
 	return Common::kNoError;
 }
diff --git a/engines/nancy/state/scene.h b/engines/nancy/state/scene.h
index 802c193723f..ff0c1e12a6f 100644
--- a/engines/nancy/state/scene.h
+++ b/engines/nancy/state/scene.h
@@ -198,6 +198,16 @@ public:
 	// Get the persistent data for a given puzzle type
 	PuzzleData *getPuzzleData(const uint32 tag);
 
+	enum State {
+		kInit,
+		kLoad,
+		kStartSound,
+		kRun
+	};
+
+	State getState() const { return _state; }
+	void setState(State state) { _state = state; }
+
 	struct Timers {
 		Time pushedPlayTime;
 		Time lastTotalTime;
@@ -221,13 +231,6 @@ private:
 	void clearSceneData();
 	void clearPuzzleData();
 
-	enum State {
-		kInit,
-		kLoad,
-		kStartSound,
-		kRun
-	};
-
 	struct SceneState {
 		SceneSummary summary;
 		SceneChangeDescription currentScene;