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

[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:
5662f8f019 NANCY: Skip pieces that don't need to be placed in onebuildpuzzle
fc8ea06fce NANCY: Fix overwriting cell phone data when changing scenes in Nancy 10


Commit: 5662f8f0195b9a133e7db1f8753ccd7d85f3f8f1
    https://github.com/scummvm/scummvm/commit/5662f8f0195b9a133e7db1f8753ccd7d85f3f8f1
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-06-16T00:13:03+03:00

Commit Message:
NANCY: Skip pieces that don't need to be placed in onebuildpuzzle

Partially fixes the tuning puzzle in Nancy 10

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


diff --git a/engines/nancy/action/puzzle/onebuildpuzzle.cpp b/engines/nancy/action/puzzle/onebuildpuzzle.cpp
index c8313c81e5b..d67b9b44dc7 100644
--- a/engines/nancy/action/puzzle/onebuildpuzzle.cpp
+++ b/engines/nancy/action/puzzle/onebuildpuzzle.cpp
@@ -496,8 +496,16 @@ void OneBuildPuzzle::clampRectToViewport(Common::Rect &rect) {
 
 void OneBuildPuzzle::checkAllPlaced() {
 	for (uint i = 0; i < _pieces.size(); ++i) {
-		if (!_pieces[i].placed)
-			return;
+		if (_pieces[i].placed)
+			continue;
+
+		// Nancy 10: pieces with an empty slotRect (top == 0 && bottom == 0)
+		// are filler — they don't need to be placed for the puzzle to solve.
+		const Common::Rect &slot = _pieces[i].slotRect;
+		if (slot.top == 0 && slot.bottom == 0)
+			continue;
+
+		return;
 	}
 	_isSolved = true;
 	_solveState = kTriggerCompletion;


Commit: fc8ea06fce09b3254864177e55a8862df306b343
    https://github.com/scummvm/scummvm/commit/fc8ea06fce09b3254864177e55a8862df306b343
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-06-16T00:13:05+03:00

Commit Message:
NANCY: Fix overwriting cell phone data when changing scenes in Nancy 10

Fixes the cell phone when returning from Dry Creek

Changed paths:
    engines/nancy/ui/cellphonepopup.cpp


diff --git a/engines/nancy/ui/cellphonepopup.cpp b/engines/nancy/ui/cellphonepopup.cpp
index 5444205603f..a283748313d 100644
--- a/engines/nancy/ui/cellphonepopup.cpp
+++ b/engines/nancy/ui/cellphonepopup.cpp
@@ -143,9 +143,6 @@ void CellPhonePopup::registerGraphics() {
 }
 
 void CellPhonePopup::setNoSignal(bool noSignal) {
-	if (_noSignal == noSignal) {
-		return;
-	}
 	_noSignal = noSignal;
 	CellPhoneData *cellData = (CellPhoneData *)NancySceneState.getPuzzleData(CellPhoneData::getTag());
 	if (cellData) {
@@ -157,9 +154,6 @@ void CellPhonePopup::setNoSignal(bool noSignal) {
 }
 
 void CellPhonePopup::setBatteryLow(bool low) {
-	if (_batteryLow == low) {
-		return;
-	}
 	_batteryLow = low;
 	CellPhoneData *cellData = (CellPhoneData *)NancySceneState.getPuzzleData(CellPhoneData::getTag());
 	if (cellData) {