[Scummvm-git-logs] scummvm master -> 24f86d6398d695185d8827d4490f88999e276371

[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:
24f86d6398 NANCY: Fix PianoPuzzle multi-key edge case


Commit: 24f86d6398d695185d8827d4490f88999e276371
    https://github.com/scummvm/scummvm/commit/24f86d6398d695185d8827d4490f88999e276371
Author: tunnelsociety (tunnelsociety at mm.st)
Date: 2026-03-15T09:38:46+02:00

Commit Message:
NANCY: Fix PianoPuzzle multi-key edge case

Eliminate a one(-ish?)-frame opportunity to click a key while another is
still down, producing a graphical glitch.

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


diff --git a/engines/nancy/action/puzzle/orderingpuzzle.cpp b/engines/nancy/action/puzzle/orderingpuzzle.cpp
index aa85295db79..047483734e7 100644
--- a/engines/nancy/action/puzzle/orderingpuzzle.cpp
+++ b/engines/nancy/action/puzzle/orderingpuzzle.cpp
@@ -459,8 +459,15 @@ void OrderingPuzzle::handleInput(NancyInput &input) {
 	}
 
 	bool canClick = true;
-	if ((_itemsStayDown || _puzzleType == kPiano) && g_nancy->_sound->isSoundPlaying(_pushDownSound)) {
+	if (_itemsStayDown && g_nancy->_sound->isSoundPlaying(_pushDownSound)) {
 		canClick = false;
+	} else if (_puzzleType == kPiano) {
+		for (int i = 0; i < _hotspots.size(); ++i) {
+			if (_downItems[i]) {
+				canClick = false;
+				break;
+			}
+		}
 	}
 
 	if (NancySceneState.getViewport().convertViewportToScreen(_exitHotspot).contains(input.mousePos)) {