[Scummvm-git-logs] scummvm master -> 62b8abf954700126f568b0d8877870a04d9efffa
mduggan
noreply at scummvm.org
Sat Jun 20 00:00:39 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
62b8abf954 ACCESS: Reset ask list position more in Noctropolis
Commit: 62b8abf954700126f568b0d8877870a04d9efffa
https://github.com/scummvm/scummvm/commit/62b8abf954700126f568b0d8877870a04d9efffa
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2026-06-20T09:59:34+10:00
Commit Message:
ACCESS: Reset ask list position more in Noctropolis
To be consistent with the original, ask list position should reset if there is
a new ask item.
Changed paths:
engines/access/noctropolis/noctropolis_game.cpp
engines/access/scripts.cpp
diff --git a/engines/access/noctropolis/noctropolis_game.cpp b/engines/access/noctropolis/noctropolis_game.cpp
index eecb61287b8..51357662c6a 100644
--- a/engines/access/noctropolis/noctropolis_game.cpp
+++ b/engines/access/noctropolis/noctropolis_game.cpp
@@ -121,6 +121,8 @@ void NoctropolisEngine::initVariables() {
entry._value = ITEM_NOT_FOUND;
}
+ _startAboutBox = _startAboutItem = 0;
+
// This is Noct_InitTravel in the original
_travScrollRow = 15;
_travScrollCol = 0;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 9853559cf8f..debbd6b6775 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -795,10 +795,11 @@ void Scripts::cmdSetAbout() {
error("Invalid index %d in cmdSetAbout", idx);
debugC(1, kDebugScripts, "cmdSetAbout(idx=%d, val=%d)", idx, val);
+ bool isChange = _vm->_ask[idx] != val;
_vm->_ask[idx] = val;
- // Reset location of about items, except in Noctropolis
- if (_vm->getGameID() != kGameNoctropolis)
+ // Reset top of list, only if it's a change in Noctropolis.
+ if (_vm->getGameID() != kGameNoctropolis || isChange)
_vm->_startAboutBox = _vm->_startAboutItem = 0;
}
More information about the Scummvm-git-logs
mailing list