[Scummvm-git-logs] scummvm master -> 70961eec15e32bae620e303cb8464de6a9edca72

[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:
f6b26a538d NANCY: Fix TurningPuzzle animation speed scaling with frame count
70961eec15 NANCY: Guard TurningPuzzle against zero _numFramesPerTurn


Commit: f6b26a538d1d2544ab76f3632e997f9c0b253443
    https://github.com/scummvm/scummvm/commit/f6b26a538d1d2544ab76f3632e997f9c0b253443
Author: flipkick (167208+flipkick at users.noreply.github.com)
Date: 2026-02-26T13:07:49+02:00

Commit Message:
NANCY: Fix TurningPuzzle animation speed scaling with frame count

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 c9574bc46a1..70097bb97f3 100644
--- a/engines/nancy/action/puzzle/turningpuzzle.cpp
+++ b/engines/nancy/action/puzzle/turningpuzzle.cpp
@@ -52,7 +52,7 @@ void TurningPuzzle::updateGraphics() {
 
 	if (_solveState == kWaitForAnimation) {
 		if (g_nancy->getTotalPlayTime() > _nextTurnTime) {
-			_nextTurnTime = g_nancy->getTotalPlayTime() + (_solveDelayBetweenTurns * 1000 / _currentOrder.size());
+			_nextTurnTime = g_nancy->getTotalPlayTime() + (_solveDelayBetweenTurns * 1000 / _currentOrder.size() / _numFramesPerTurn);
 
 			if (	(_turnFrameID == 0 && _solveAnimFace == 0) ||
 					(_turnFrameID == 1 && _solveAnimFace > 0 && (int)_solveAnimFace < _numFaces - 1)) {
@@ -92,7 +92,7 @@ void TurningPuzzle::updateGraphics() {
 
 	if (_objectCurrentlyTurning != -1) {
 		if (g_nancy->getTotalPlayTime() > _nextTurnTime) {
-			_nextTurnTime = g_nancy->getTotalPlayTime() + (_solveDelayBetweenTurns * 1000 / _currentOrder.size());
+			_nextTurnTime = g_nancy->getTotalPlayTime() + (_solveDelayBetweenTurns * 1000 / _currentOrder.size() / _numFramesPerTurn);
 			++_turnFrameID;
 
 			uint faceID = _currentOrder[_objectCurrentlyTurning];


Commit: 70961eec15e32bae620e303cb8464de6a9edca72
    https://github.com/scummvm/scummvm/commit/70961eec15e32bae620e303cb8464de6a9edca72
Author: flipkick (167208+flipkick at users.noreply.github.com)
Date: 2026-02-26T13:07:49+02:00

Commit Message:
NANCY: Guard TurningPuzzle against zero _numFramesPerTurn

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 70097bb97f3..726a97c76c5 100644
--- a/engines/nancy/action/puzzle/turningpuzzle.cpp
+++ b/engines/nancy/action/puzzle/turningpuzzle.cpp
@@ -132,6 +132,9 @@ void TurningPuzzle::readData(Common::SeekableReadStream &stream) {
 	uint numSpindles = stream.readUint16LE();
 	_numFaces = stream.readUint16LE();
 	_numFramesPerTurn = stream.readUint16LE();
+	if (_numFramesPerTurn == 0) {
+		error("TurningPuzzle::readData(): _numFramesPerTurn is 0");
+	}
 
 	_startPositions.resize(numSpindles);
 	for (uint i = 0; i < numSpindles; ++i) {