[Scummvm-git-logs] scummvm master -> d82137a4b8d2b7458c30be5d748a1e1f5487c0da
bluegr
noreply at scummvm.org
Fri Apr 17 10:24:33 UTC 2026
This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
64fdcd8a28 NANCY: Add stubs for puzzle ARs for Nancy 10 - 13
168d0f9b70 NANCY: Initialize class variables. CID 1653441
1281ead3b6 NANCY: Check results of dynamic_cast. CID 1646422
33999af97b NANCY: Remove dead code. CID 1645860
14073b3e68 NANCY: Fix vertical length checks in MatchPuzzle. CID 1645854
030919ffe3 NANCY: Use Common::move() when loading RippedLetter data. CID 1645766
d82137a4b8 NANCY: Initialize class variables. CID 1643246
Commit: 64fdcd8a283136a245ae885e85e2416a773b0e2b
https://github.com/scummvm/scummvm/commit/64fdcd8a283136a245ae885e85e2416a773b0e2b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-04-17T13:23:56+03:00
Commit Message:
NANCY: Add stubs for puzzle ARs for Nancy 10 - 13
Changed paths:
engines/nancy/action/arfactory.cpp
diff --git a/engines/nancy/action/arfactory.cpp b/engines/nancy/action/arfactory.cpp
index 29ecec5fd53..4a6b14b8ddf 100644
--- a/engines/nancy/action/arfactory.cpp
+++ b/engines/nancy/action/arfactory.cpp
@@ -444,6 +444,22 @@ ActionRecord *ActionManager::createActionRecord(uint16 type, Common::SeekableRea
return new WhaleSurvivorPuzzle();
case 238:
return new MemoryPuzzle();
+ // -- Nancy 10 and up --
+ case 239:
+ //return new SortPuzzle();
+ case 241:
+ // return new DotConnectPuzzle();
+ case 242:
+ // return new MagnetMazePuzzle();
+ case 243:
+ // return new BeadPuzzle();
+ case 244:
+ // return new GridMapPuzzle();
+ // -- Nancy 11 and up --
+ case 245:
+ // return new TypingQuizPuzzle();
+ case 246:
+ // return new MatchPuzzle();
default:
warning("Unknown action record type %d", type);
return nullptr;
Commit: 168d0f9b707d5bbef5ba0b5dbdf271bf7f11a3cf
https://github.com/scummvm/scummvm/commit/168d0f9b707d5bbef5ba0b5dbdf271bf7f11a3cf
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-04-17T13:24:00+03:00
Commit Message:
NANCY: Initialize class variables. CID 1653441
Changed paths:
engines/nancy/action/navigationrecords.h
diff --git a/engines/nancy/action/navigationrecords.h b/engines/nancy/action/navigationrecords.h
index e6b193a7977..705a847f872 100644
--- a/engines/nancy/action/navigationrecords.h
+++ b/engines/nancy/action/navigationrecords.h
@@ -44,6 +44,7 @@ class HotSingleFrameSceneChange : public SceneChange {
public:
HotSingleFrameSceneChange(bool readExtra = false) : _readExtra(readExtra) {
_hasHotspot = false;
+ _hoverCursor = CursorManager::kNormal;
}
virtual ~HotSingleFrameSceneChange() {}
Commit: 1281ead3b61551a625581bede12b483ff17542a7
https://github.com/scummvm/scummvm/commit/1281ead3b61551a625581bede12b483ff17542a7
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-04-17T13:24:02+03:00
Commit Message:
NANCY: Check results of dynamic_cast. CID 1646422
Changed paths:
engines/nancy/ui/viewport.cpp
diff --git a/engines/nancy/ui/viewport.cpp b/engines/nancy/ui/viewport.cpp
index 47280a9d807..5b2075db2cd 100644
--- a/engines/nancy/ui/viewport.cpp
+++ b/engines/nancy/ui/viewport.cpp
@@ -274,10 +274,14 @@ void Viewport::setFrame(uint frameNr) {
if (_videoType == kVideoPlaytypeAVF) {
AVFDecoder *decoder = dynamic_cast<AVFDecoder *>(_decoder.get());
+ if (!decoder)
+ error("Viewport::setFrame(): Decoder is not an AVFDecoder");
newFrame = decoder->decodeFrame(frameNr);
decoder->seek(frameNr); // Seek to take advantage of caching
} else {
Video::BinkDecoder *decoder = dynamic_cast<Video::BinkDecoder *>(_decoder.get());
+ if (!decoder)
+ error("Viewport::setFrame(): Decoder is not a BinkDecoder");
decoder->seek(frameNr); // Seek to take advantage of caching
newFrame = decoder->decodeNextFrame();
}
Commit: 33999af97b50abdfc9a572856704eb1d0696f50b
https://github.com/scummvm/scummvm/commit/33999af97b50abdfc9a572856704eb1d0696f50b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-04-17T13:24:04+03:00
Commit Message:
NANCY: Remove dead code. CID 1645860
Changed paths:
engines/nancy/action/puzzle/arcadepuzzle.cpp
diff --git a/engines/nancy/action/puzzle/arcadepuzzle.cpp b/engines/nancy/action/puzzle/arcadepuzzle.cpp
index dcb5f0e3c80..5d0dd8e342a 100644
--- a/engines/nancy/action/puzzle/arcadepuzzle.cpp
+++ b/engines/nancy/action/puzzle/arcadepuzzle.cpp
@@ -1254,7 +1254,6 @@ void ArcadePuzzle::updateTimer() {
uint32 mins = totalSecs / 60;
uint32 secs = totalSecs % 60;
if (mins > 59) mins = 59;
- if (secs > 59) secs = 59;
if (mins != _timerMins || secs != _timerSecs) {
_timerMins = mins;
Commit: 14073b3e68930acd60b81684d4183af5a369a713
https://github.com/scummvm/scummvm/commit/14073b3e68930acd60b81684d4183af5a369a713
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-04-17T13:24:05+03:00
Commit Message:
NANCY: Fix vertical length checks in MatchPuzzle. CID 1645854
Changed paths:
engines/nancy/action/puzzle/matchpuzzle.cpp
diff --git a/engines/nancy/action/puzzle/matchpuzzle.cpp b/engines/nancy/action/puzzle/matchpuzzle.cpp
index 18947345cf1..f51e79e2ea5 100644
--- a/engines/nancy/action/puzzle/matchpuzzle.cpp
+++ b/engines/nancy/action/puzzle/matchpuzzle.cpp
@@ -493,8 +493,7 @@ void MatchPuzzle::checkForMatch(int col, int row) {
_grid[col][r].matched = true;
_score += _scorePerFlag;
}
- // 3-bonus checks hLen (apparent original bug), kept faithful
- if (hLen == 2)
+ if (vLen == 2)
_timerDeadline += (uint32)_timeBonusFor3 * 1000;
else if (vLen == 3) {
_score += _scoreBonusFor4;
Commit: 030919ffe38f429fd7a77186d88f61ce113687f5
https://github.com/scummvm/scummvm/commit/030919ffe38f429fd7a77186d88f61ce113687f5
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-04-17T13:24:06+03:00
Commit Message:
NANCY: Use Common::move() when loading RippedLetter data. CID 1645766
Changed paths:
engines/nancy/puzzledata.cpp
diff --git a/engines/nancy/puzzledata.cpp b/engines/nancy/puzzledata.cpp
index d24a3561604..71a3584e531 100644
--- a/engines/nancy/puzzledata.cpp
+++ b/engines/nancy/puzzledata.cpp
@@ -82,8 +82,8 @@ void RippedLetterPuzzleData::synchronize(Common::Serializer &ser) {
ser.syncArray(serializedRotations.data(), serializedRotations.size(), Common::Serializer::Byte);
if (ser.isLoading()) {
- order = serializedOrder;
- rotations = serializedRotations;
+ Common::move(serializedOrder.begin(), serializedOrder.end(), order.begin());
+ Common::move(serializedRotations.begin(), serializedRotations.end(), rotations.begin());
}
}
Commit: d82137a4b8d2b7458c30be5d748a1e1f5487c0da
https://github.com/scummvm/scummvm/commit/d82137a4b8d2b7458c30be5d748a1e1f5487c0da
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2026-04-17T13:24:07+03:00
Commit Message:
NANCY: Initialize class variables. CID 1643246
Changed paths:
engines/nancy/state/setupmenu.h
diff --git a/engines/nancy/state/setupmenu.h b/engines/nancy/state/setupmenu.h
index bd45c38f270..b1cbfc744a3 100644
--- a/engines/nancy/state/setupmenu.h
+++ b/engines/nancy/state/setupmenu.h
@@ -61,7 +61,7 @@ private:
Common::Array<Common::ScopedPtr<UI::Scrollbar>> _scrollbars;
Common::ScopedPtr<UI::Button> _exitButton;
- const SET *_setupData;
+ const SET *_setupData = nullptr;
};
} // End of namespace State
More information about the Scummvm-git-logs
mailing list