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

bluegr noreply at scummvm.org
Mon May 26 04:39:02 UTC 2025


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:
b367239918 NANCY: Fix reset sound in SafeDialPuzzle
ce0754fedd NANCY: Remove extraneous debug statement in SafeDialPuzzle


Commit: b367239918fb2d4b74c1f2a6f2d3c0435d1fb44d
    https://github.com/scummvm/scummvm/commit/b367239918fb2d4b74c1f2a6f2d3c0435d1fb44d
Author: tunnelsociety (150493071+tunnelsociety at users.noreply.github.com)
Date: 2025-05-26T07:38:57+03:00

Commit Message:
NANCY: Fix reset sound in SafeDialPuzzle

The first sound should be select, not reset. (The second sound
is the reset sound.)

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


diff --git a/engines/nancy/action/puzzle/safedialpuzzle.cpp b/engines/nancy/action/puzzle/safedialpuzzle.cpp
index 27484201211..f54f08b791a 100644
--- a/engines/nancy/action/puzzle/safedialpuzzle.cpp
+++ b/engines/nancy/action/puzzle/safedialpuzzle.cpp
@@ -283,7 +283,7 @@ void SafeDialPuzzle::handleInput(NancyInput &input) {
 
 		if (!g_nancy->_sound->isSoundPlaying(_resetSound) && input.input & NancyInput::kLeftMouseButtonUp) {
 			_drawSurface.blitFrom(_image1, _resetSrc, _resetDest);
-			g_nancy->_sound->playSound(_resetSound);
+			g_nancy->_sound->playSound(_selectSound);
 			_animState = kReset;
 			_nextAnim = g_nancy->getTotalPlayTime() + 500; // hardcoded
 			_current = 0;


Commit: ce0754fedde762d2b4d02eff79422bbd7e7050c0
    https://github.com/scummvm/scummvm/commit/ce0754fedde762d2b4d02eff79422bbd7e7050c0
Author: tunnelsociety (150493071+tunnelsociety at users.noreply.github.com)
Date: 2025-05-26T07:38:57+03:00

Commit Message:
NANCY: Remove extraneous debug statement in SafeDialPuzzle

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


diff --git a/engines/nancy/action/puzzle/safedialpuzzle.cpp b/engines/nancy/action/puzzle/safedialpuzzle.cpp
index f54f08b791a..3c6e6bdbc70 100644
--- a/engines/nancy/action/puzzle/safedialpuzzle.cpp
+++ b/engines/nancy/action/puzzle/safedialpuzzle.cpp
@@ -296,7 +296,6 @@ void SafeDialPuzzle::handleInput(NancyInput &input) {
 }
 
 void SafeDialPuzzle::drawDialFrame(uint frame) {
-	debug("%u", frame);
 	if (frame >= _dialSrcs.size() / 2 && !_imageName2.empty()) {
 		_drawSurface.blitFrom(_image2, _dialSrcs[frame], _dialDest);
 	} else {




More information about the Scummvm-git-logs mailing list