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

[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:
274b3c1606 NANCY: Fix secondary video loading for Nancy10+
ad2f2d93e1 NANCY: Fix quizpuzzle auto-check text boxes


Commit: 274b3c1606738fbbaf3ec0ac6251ad8ecb147ed9
    https://github.com/scummvm/scummvm/commit/274b3c1606738fbbaf3ec0ac6251ad8ecb147ed9
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-14T03:18:37+03:00

Commit Message:
NANCY: Fix secondary video loading for Nancy10+

Character videos play correctly now

Changed paths:
    engines/nancy/action/secondaryvideo.cpp


diff --git a/engines/nancy/action/secondaryvideo.cpp b/engines/nancy/action/secondaryvideo.cpp
index bc2966b8a9b..c6f7da9d583 100644
--- a/engines/nancy/action/secondaryvideo.cpp
+++ b/engines/nancy/action/secondaryvideo.cpp
@@ -178,22 +178,14 @@ void PlaySecondaryVideo::readData(Common::SeekableReadStream &stream) {
 	_sceneChange.readData(stream, ser.getVersion() == kGameTypeVampire);
 	ser.skip(1, kGameTypeNancy1);
 
+	ser.skip(2, kGameTypeNancy10);
+
 	uint16 numVideoDescs = 0;
 	ser.syncAsUint16LE(numVideoDescs);
 	_videoDescs.resize(numVideoDescs);
 	for (uint i = 0; i < numVideoDescs; ++i) {
 		_videoDescs[i].readData(stream);
 	}
-
-	if (g_nancy->getGameType() >= kGameTypeNancy10) {
-		// TODO: Hotspot data
-		uint32 num;
-		ser.syncAsUint32LE(num);
-		Common::Array<Common::Rect> rects;
-		readRectArray(stream, rects, 4);
-
-		stream.skip(16);
-	}
 }
 
 void PlaySecondaryVideo::execute() {


Commit: ad2f2d93e14020f1627db988ea3134aeb9b1b05a
    https://github.com/scummvm/scummvm/commit/ad2f2d93e14020f1627db988ea3134aeb9b1b05a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-05-14T03:18:41+03:00

Commit Message:
NANCY: Fix quizpuzzle auto-check text boxes

Fix #16797

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


diff --git a/engines/nancy/action/puzzle/quizpuzzle.cpp b/engines/nancy/action/puzzle/quizpuzzle.cpp
index 2970475944c..f1b7228c30f 100644
--- a/engines/nancy/action/puzzle/quizpuzzle.cpp
+++ b/engines/nancy/action/puzzle/quizpuzzle.cpp
@@ -399,7 +399,7 @@ void QuizPuzzle::executeNew() {
 						bool correct = checkAnswerForCurrentBox();
 						if (correct) {
 							_internalState = kStartCorrect;
-						} else if ((uint16)text.size() > _boxMaxLen[_currentBox]) {
+						} else if ((uint16)text.size() >= _boxMaxLen[_currentBox]) {
 							_internalState = kStartWrong;
 						}
 					}