[Scummvm-git-logs] scummvm master -> 8fea3b5cdead41bf588a7d93c47dc8a1492b67c8

bluegr noreply at scummvm.org
Thu Apr 16 17:47:54 UTC 2026


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:
8fea3b5cde NANCY: Only keep the state of RipperLetterPuzzle when it's initialized


Commit: 8fea3b5cdead41bf588a7d93c47dc8a1492b67c8
    https://github.com/scummvm/scummvm/commit/8fea3b5cdead41bf588a7d93c47dc8a1492b67c8
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-04-16T20:47:15+03:00

Commit Message:
NANCY: Only keep the state of RipperLetterPuzzle when it's initialized

Fixes puzzle state in cases when it's not initialized yet - bug #16677

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


diff --git a/engines/nancy/action/puzzle/rippedletterpuzzle.cpp b/engines/nancy/action/puzzle/rippedletterpuzzle.cpp
index da882c11ea5..f6e7afa2ddd 100644
--- a/engines/nancy/action/puzzle/rippedletterpuzzle.cpp
+++ b/engines/nancy/action/puzzle/rippedletterpuzzle.cpp
@@ -216,6 +216,23 @@ void RippedLetterPuzzle::execute() {
 					break;
 				}
 			}
+
+			// Traverse the order and rotations arrays to check if
+			// they have been initialized. If they haven't, they'll
+			// be full of zeroes, so there's no progress to continue,
+			// thus the arrays will need to be initialized normally.
+			if (hasLoadedProgress) {
+				bool arraysAreInitialized = false;
+				for (uint i = 0; i < loadedStateSize; ++i) {
+					if (_puzzleState->order[i] != 0 || _puzzleState->rotations[i] != 0) {
+						arraysAreInitialized = true;
+						break;
+					}
+				}
+
+				if (!arraysAreInitialized)
+					hasLoadedProgress = false;
+			}
 		}
 
 		// The serialized puzzle state uses 24 slots. Resize it to




More information about the Scummvm-git-logs mailing list