[Scummvm-git-logs] scummvm master -> 918abb6770a18827bd330550784b9f0fc40241f0
bluegr
noreply at scummvm.org
Wed Aug 5 00:41:14 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:
918abb6770 NANCY: NANCY10: Fixes for TurningPuzzle
Commit: 918abb6770a18827bd330550784b9f0fc40241f0
https://github.com/scummvm/scummvm/commit/918abb6770a18827bd330550784b9f0fc40241f0
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-08-05T03:40:58+03:00
Commit Message:
NANCY: NANCY10: Fixes for TurningPuzzle
- Use the correct hover cursor for Nancy10+ games
- Ignore clicks for as long as the previous turn's sound keeps playing
Fix #17029
Changed paths:
engines/nancy/action/puzzle/turningpuzzle.cpp
diff --git a/engines/nancy/action/puzzle/turningpuzzle.cpp b/engines/nancy/action/puzzle/turningpuzzle.cpp
index 53c3c675516..d8a59a6b96f 100644
--- a/engines/nancy/action/puzzle/turningpuzzle.cpp
+++ b/engines/nancy/action/puzzle/turningpuzzle.cpp
@@ -482,6 +482,8 @@ void TurningPuzzle::handleInput(NancyInput &input) {
if (isNancy13)
g_nancy->_cursor->setCursorType((CursorManager::CursorType)_hoverCursorType, true);
+ else if (g_nancy->getGameType() >= kGameTypeNancy10)
+ g_nancy->_cursor->setCursorType(CursorManager::kNewUseHandHotspot);
else
g_nancy->_cursor->setCursorType(CursorManager::kHotspot);
@@ -506,6 +508,11 @@ void TurningPuzzle::handleInput(NancyInput &input) {
_turnFrameID = 0;
_nextTurnTime = 0;
} else {
+ // A click is ignored for as long as the previous turn's sound keeps playing.
+ if (g_nancy->_sound->isSoundPlaying(_turnSound)) {
+ break;
+ }
+
g_nancy->_sound->playSound(_turnSound);
}
More information about the Scummvm-git-logs
mailing list