[Scummvm-git-logs] scummvm master -> ba0e42e6f1d472906353e2b9e24468f534e5cba8
bluegr
noreply at scummvm.org
Tue May 12 05:54:53 UTC 2026
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
ff708aa587 NANCY: Fix issues with memorypuzzle (Jenna's locked box in nancy9)
f1fe9a4c23 NANCY: Change cursor to a hand over unplaced pieces in onebuildpuzzle
d970858165 NANCY: Fix orderingpuzzle issues (flag buttons puzzle in Nancy9)
ba0e42e6f1 NANCY: Draw quit button in the start screen of Never a Dall Moment
Commit: ff708aa58789e47aeee5ac3e68f18baa5250d7d6
https://github.com/scummvm/scummvm/commit/ff708aa58789e47aeee5ac3e68f18baa5250d7d6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-12T08:53:57+03:00
Commit Message:
NANCY: Fix issues with memorypuzzle (Jenna's locked box in nancy9)
- Change the cursor to highlight over clickable squares
- Add missing click when switching tabs at the top
Fix #16801
Changed paths:
engines/nancy/action/puzzle/memorypuzzle.cpp
diff --git a/engines/nancy/action/puzzle/memorypuzzle.cpp b/engines/nancy/action/puzzle/memorypuzzle.cpp
index 70f7b1e61b7..65ba67ed2bf 100644
--- a/engines/nancy/action/puzzle/memorypuzzle.cpp
+++ b/engines/nancy/action/puzzle/memorypuzzle.cpp
@@ -269,6 +269,8 @@ void MemoryPuzzle::handleInput(NancyInput &input) {
_firstFlip = -1;
}
_currentTab = slot;
+ if (_cardFlipSound.name != "NO SOUND")
+ g_nancy->_sound->playSound(_cardFlipSound);
redrawCards();
}
return;
@@ -279,9 +281,6 @@ void MemoryPuzzle::handleInput(NancyInput &input) {
if (_flipTimerActive)
return;
- if (!(input.input & NancyInput::kLeftMouseButtonUp))
- return;
-
int base = _currentTab * kCardsPerTab;
for (int i = 0; i < kCardsPerTab; ++i) {
if (!_cardRects[i].contains(mouseVP))
@@ -294,6 +293,11 @@ void MemoryPuzzle::handleInput(NancyInput &input) {
if (card.typeId == -1 || card.matchState != 0 || card.flipState != 0)
return;
+ g_nancy->_cursor->setCursorType(CursorManager::kHotspot);
+
+ if (!(input.input & NancyInput::kLeftMouseButtonUp))
+ return;
+
// Flip this card face-up
card.flipState = 1;
if (_cardFlipSound.name != "NO SOUND")
Commit: f1fe9a4c23baad10747da0384fcfebcb614a6d9c
https://github.com/scummvm/scummvm/commit/f1fe9a4c23baad10747da0384fcfebcb614a6d9c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-12T08:53:59+03:00
Commit Message:
NANCY: Change cursor to a hand over unplaced pieces in onebuildpuzzle
Fix #16787
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 799b1022ac7..63517c8b928 100644
--- a/engines/nancy/action/puzzle/onebuildpuzzle.cpp
+++ b/engines/nancy/action/puzzle/onebuildpuzzle.cpp
@@ -331,7 +331,8 @@ void OneBuildPuzzle::handleInput(NancyInput &input) {
}
if (topmostAny != -1) {
- g_nancy->_cursor->setCursorType(CursorManager::kCustom1);
+ if (topmostUnplaced != -1)
+ g_nancy->_cursor->setCursorType(CursorManager::kCustom1);
// Left click on an unplaced piece: pick it up
// Right click: pick it up and rotate it
Commit: d9708581657b8070b3038b08decc043b70e7f097
https://github.com/scummvm/scummvm/commit/d9708581657b8070b3038b08decc043b70e7f097
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-12T08:54:02+03:00
Commit Message:
NANCY: Fix orderingpuzzle issues (flag buttons puzzle in Nancy9)
- Check for the exact number of buttons that should be pressed in the
sequence before popping up all buttons. Adding a game check for this
check, since we'll need to eventually test the other Nancy games with
this change, regarding the Ordering puzzle type
- Fix popup sound check. now button sounds are correctly heard when a
button is unpressed
Fix #16775
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 e8a1f0489e0..942031d0714 100644
--- a/engines/nancy/action/puzzle/orderingpuzzle.cpp
+++ b/engines/nancy/action/puzzle/orderingpuzzle.cpp
@@ -336,6 +336,19 @@ void OrderingPuzzle::execute() {
clearAllElements();
return;
}
+
+ // In the clam puzzle with flags in Nancy9, test for the exact
+ // number of flag buttons pressed. Keeping this with a game
+ // version check for now, to avoid regressions in other puzzle
+ // types in other games.
+ // TODO: Merge with the above check once all the puzzle types
+ // have been retested
+ if (g_nancy->getGameType() == kGameTypeNancy9 && _puzzleType == kOrdering) {
+ if (_clickedSequence.size() >= _correctSequence.size()) {
+ clearAllElements();
+ return;
+ }
+ }
} else {
// OrderItems has a slight delay, after which it actually clears
if (_clickedSequence.size() == _correctSequence.size()) {
@@ -610,7 +623,7 @@ void OrderingPuzzle::popUp(uint id) {
if (g_nancy->getGameType() == kGameTypeVampire) {
g_nancy->_sound->playSound("BUOK");
} else {
- if (_popUpSound.name.size()) {
+ if (!_popUpSound.name.empty() && _popUpSound.name != "NO SOUND") {
g_nancy->_sound->playSound(_popUpSound);
} else {
g_nancy->_sound->playSound(_pushDownSound);
Commit: ba0e42e6f1d472906353e2b9e24468f534e5cba8
https://github.com/scummvm/scummvm/commit/ba0e42e6f1d472906353e2b9e24468f534e5cba8
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-12T08:54:03+03:00
Commit Message:
NANCY: Draw quit button in the start screen of Never a Dall Moment
Fix #16790
Changed paths:
engines/nancy/action/puzzle/whalesurvivorpuzzle.cpp
diff --git a/engines/nancy/action/puzzle/whalesurvivorpuzzle.cpp b/engines/nancy/action/puzzle/whalesurvivorpuzzle.cpp
index 3f165a8e3af..90f1a946bc0 100644
--- a/engines/nancy/action/puzzle/whalesurvivorpuzzle.cpp
+++ b/engines/nancy/action/puzzle/whalesurvivorpuzzle.cpp
@@ -820,6 +820,10 @@ void WhaleSurvivorPuzzle::redraw() {
_drawSurface.blitFrom(_imageStart, Common::Point(_overlayRect.left, _overlayRect.top));
_drawSurface.blitFrom(_imageMain, _startButtonHeld ? _startButtonSrcRects[1] : _startButtonSrcRects[0],
Common::Point(_startButtonDestRect.left, _startButtonDestRect.top));
+
+ // Draw quit button (pressed variant while mouse held)
+ _drawSurface.blitFrom(_imageMain, _quitButtonHeld ? _quitButtonSrcRects[1] : _quitButtonSrcRects[0],
+ Common::Point(_quitButtonDestRect.left, _quitButtonDestRect.top));
return;
case kHitAnimation:
More information about the Scummvm-git-logs
mailing list