[Scummvm-git-logs] scummvm master -> 6d774cc7a15b276af0eb4ebcff26eef230bb2296

[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:
407291417e NANCY: Fix compilation
6d774cc7a1 NANCY: Document new chunks for Nancy 14 and 15


Commit: 407291417e18981d0d59aba8bf3e5a9440c39aa8
    https://github.com/scummvm/scummvm/commit/407291417e18981d0d59aba8bf3e5a9440c39aa8
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-02T06:08:46+03:00

Commit Message:
NANCY: Fix compilation

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


diff --git a/engines/nancy/action/actionmanager.h b/engines/nancy/action/actionmanager.h
index cc4b541a495..09dc47d897a 100644
--- a/engines/nancy/action/actionmanager.h
+++ b/engines/nancy/action/actionmanager.h
@@ -71,15 +71,17 @@ public:
 
 	void synchronize(Common::Serializer &serializer);
 
+	static ActionRecord *createAndLoadNewRecord(Common::SeekableReadStream &inputData);
+
+	Common::Array<ActionRecord *> _records;
+
 protected:
 	static ActionRecord *createActionRecord(uint16 type, Common::SeekableReadStream *recordStream = nullptr);
-	static ActionRecord *createAndLoadNewRecord(Common::SeekableReadStream &inputData);
 
 	void synchronizeMovieWithSound();
 
 	void debugDrawHotspots();
 
-	Common::Array<ActionRecord *> _records;
 	bool _recordsWereExecuted = false; // Used for kDefaultAR dependency
 	Common::Array<ActionRecord *> _activatedRecordsThisFrame;
 };
diff --git a/engines/nancy/action/actionrecord.h b/engines/nancy/action/actionrecord.h
index 8bcd965ce0b..fd76528f0bb 100644
--- a/engines/nancy/action/actionrecord.h
+++ b/engines/nancy/action/actionrecord.h
@@ -119,13 +119,13 @@ public:
 	virtual CursorManager::CursorType getHoverCursor() const { return CursorManager::kHotspot; }
 	virtual void handleInput(NancyInput &input) {}
 
+	// Used for debugging
+	virtual Common::String getRecordTypeName() const = 0;
+
 protected:
 	void finishExecution();
 	virtual bool canHaveHotspot() const { return false; } // Used for handling kCursorType dependency
 
-	// Used for debugging
-	virtual Common::String getRecordTypeName() const = 0;
-
 public:
 	Common::String _description;
 	byte _type;
diff --git a/engines/nancy/state/scene.h b/engines/nancy/state/scene.h
index df6824a7579..802c193723f 100644
--- a/engines/nancy/state/scene.h
+++ b/engines/nancy/state/scene.h
@@ -198,6 +198,18 @@ public:
 	// Get the persistent data for a given puzzle type
 	PuzzleData *getPuzzleData(const uint32 tag);
 
+	struct Timers {
+		Time pushedPlayTime;
+		Time lastTotalTime;
+		Time sceneTime;
+		Time timerTime;
+		bool timerIsActive = false;
+		Time playerTime;           // In-game time of day, adds a minute every 5 seconds
+		Time playerTimeNextMinute; // Stores the next tick count until we add a minute to playerTime
+	};
+
+	Timers _timers;
+
 private:
 	void init();
 	void load(bool fromSaveFile = false);
@@ -227,16 +239,6 @@ private:
 		bool isInvScenePushed = false;
 	};
 
-	struct Timers {
-		Time pushedPlayTime;
-		Time lastTotalTime;
-		Time sceneTime;
-		Time timerTime;
-		bool timerIsActive = false;
-		Time playerTime; // In-game time of day, adds a minute every 5 seconds
-		Time playerTimeNextMinute; // Stores the next tick count until we add a minute to playerTime
-	};
-
 	struct PlayFlags {
 		struct LogicCondition {
 			LogicCondition();
@@ -282,7 +284,6 @@ private:
 	// General data
 	SceneState _sceneState;
 	PlayFlags _flags;
-	Timers _timers;
 	uint16 _difficulty;
 	Common::Array<uint16> _hintsRemaining;
 	int16 _lastHintCharacter;


Commit: 6d774cc7a15b276af0eb4ebcff26eef230bb2296
    https://github.com/scummvm/scummvm/commit/6d774cc7a15b276af0eb4ebcff26eef230bb2296
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-02T06:17:18+03:00

Commit Message:
NANCY: Document new chunks for Nancy 14 and 15

Changed paths:
    engines/nancy/nancy.cpp


diff --git a/engines/nancy/nancy.cpp b/engines/nancy/nancy.cpp
index 9dd72a66352..2adc0922a34 100644
--- a/engines/nancy/nancy.cpp
+++ b/engines/nancy/nancy.cpp
@@ -503,7 +503,18 @@ void NancyEngine::bootGameEngine() {
 	// Nancy 13+
 	// RCPR and RCLB chunks have been removed
 	// LOAD_BOOT(MMIX)
-	
+
+	// Nancy 14+
+	// LOAD_BOOT(UICM)
+
+	// Nancy 15+
+	// TASK, UIRC, UIIV, UICO, UICM, UICL,
+	// UIBW, UINB, SCTB, CURT, TMOD chunks have
+	// been removed
+	// LOAD_BOOT(LVLN)
+	// LOAD_BOOT(PCUI)
+	// LOAD_BOOT(LDSN)
+
 	_cursor->init(iff->getChunkStream("CURS"));
 
 	_graphics->init();