[Scummvm-git-logs] scummvm master -> 7986f452a1f9b097b3952dce0308174894c290e3
mduggan
noreply at scummvm.org
Mon May 25 11:32:37 UTC 2026
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
0067bb2356 ACCESS: Allow skipping of speech in Amazon
02fa7e4500 ACCESS: Fix uninitialized members. PVS-Studio V730
7986f452a1 ACCESS: Remove redundant assignments. PVS-Studio V1048
Commit: 0067bb2356bbbce6a49ab3cf73214455d1adfbf0
https://github.com/scummvm/scummvm/commit/0067bb2356bbbce6a49ab3cf73214455d1adfbf0
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2026-05-25T21:32:26+10:00
Commit Message:
ACCESS: Allow skipping of speech in Amazon
Changed paths:
engines/access/access.cpp
engines/access/amazon/amazon_logic.cpp
diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 19d5b5af5ed..8cc6cdaf89c 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -287,8 +287,14 @@ void AccessEngine::speakText(BaseSurface *s, const Common::String &msg) {
_sound->loadSoundTable(0, _narateFile + 99, _sndSubFile);
_sound->playSound(0);
- while(_sound->isSFXPlaying() && !shouldQuit())
+ while(_sound->isSFXPlaying() && !shouldQuit()) {
_events->pollEvents();
+ if (_events->peekAction() == kActionSkip) {
+ Common::CustomEventType action;
+ _events->getAction(action);
+ _sound->stopSound();
+ }
+ }
_scripts->cmdFreeSound();
@@ -319,8 +325,14 @@ void AccessEngine::speakText(BaseSurface *s, const Common::String &msg) {
_sound->loadAndAddSound(_narateFile + 99, _sndSubFile);
_sound->playSound(0);
- while(_sound->isSFXPlaying() && !shouldQuit())
+ while(_sound->isSFXPlaying() && !shouldQuit()) {
_events->pollEvents();
+ if (_events->peekAction() == kActionSkip) {
+ Common::CustomEventType action;
+ _events->getAction(action);
+ _sound->stopSound();
+ }
+ }
_scripts->cmdFreeSound();
diff --git a/engines/access/amazon/amazon_logic.cpp b/engines/access/amazon/amazon_logic.cpp
index 4f8fa57862c..aeb79964d1b 100644
--- a/engines/access/amazon/amazon_logic.cpp
+++ b/engines/access/amazon/amazon_logic.cpp
@@ -357,8 +357,13 @@ void Opening::doTitle() {
_vm->_events->_vbCount = 70;
while (!_vm->shouldQuit() && _vm->_events->_vbCount > 0 && !_skipStart) {
_vm->_events->pollEventsAndWait();
- if (_vm->_events->_rightButton)
- _skipStart = true;
+ bool skip = _vm->_events->_rightButton;
+ if (_vm->_events->peekAction() == kActionSkip) {
+ Common::CustomEventType event;
+ _vm->_events->getAction(event);
+ skip = true;
+ }
+ _skipStart = skip;
}
}
if (_vm->shouldQuit())
Commit: 02fa7e45003374a5ac6ade573cb2488c6e56f13e
https://github.com/scummvm/scummvm/commit/02fa7e45003374a5ac6ade573cb2488c6e56f13e
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2026-05-25T21:32:26+10:00
Commit Message:
ACCESS: Fix uninitialized members. PVS-Studio V730
Changed paths:
engines/access/access.cpp
engines/access/noctropolis/noctropolis_comicviewer.cpp
engines/access/noctropolis/noctropolis_game.cpp
engines/access/screen.cpp
engines/access/scripts.cpp
engines/access/video.cpp
diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 8cc6cdaf89c..4cfe81b9beb 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -104,6 +104,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
ARRAYCLEAR(_travel);
_startTravelItem = _startTravelBox = 0;
ARRAYCLEAR(_ask);
+ ARRAYCLEAR(_asked);
_startAboutItem = _startAboutBox = 0;
_keepAskPosition = false;
_bcnt = 0;
diff --git a/engines/access/noctropolis/noctropolis_comicviewer.cpp b/engines/access/noctropolis/noctropolis_comicviewer.cpp
index 04a56ec345e..7a362d59e1f 100644
--- a/engines/access/noctropolis/noctropolis_comicviewer.cpp
+++ b/engines/access/noctropolis/noctropolis_comicviewer.cpp
@@ -33,7 +33,8 @@ ComicResource::ComicResource(const ComicPage *pages[], int npages) {
////////////////
-ComicViewer::ComicViewer(NoctropolisEngine *vm) : _vm(vm) {
+ComicViewer::ComicViewer(NoctropolisEngine *vm) : _vm(vm), _comic(nullptr),
+ _bubbleSprites(nullptr), _currPage(0) {
}
ComicViewer::~ComicViewer() {
diff --git a/engines/access/noctropolis/noctropolis_game.cpp b/engines/access/noctropolis/noctropolis_game.cpp
index f1c86124d90..5c183c60594 100644
--- a/engines/access/noctropolis/noctropolis_game.cpp
+++ b/engines/access/noctropolis/noctropolis_game.cpp
@@ -40,10 +40,12 @@ AccessEngine(syst, gameDesc), _invScript(nullptr), _stil(nullptr), _loadFlag(fal
_travScrollX(0), _travScrollY(0), _travScrollCol(0), _travScrollRow(0), _stilFlag1(_flags[205]),
_stilFlag2(_flags[234])
{
+ ARRAYCLEAR(_minigameCurrentConfig);
}
NoctropolisEngine::~NoctropolisEngine() {
delete _invScript;
+ // _midi will be deleted in parent.
}
void NoctropolisEngine::initObjects() {
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index e188bdd3cfc..0ae13ff3bbc 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -42,6 +42,7 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
Graphics::Screen::create(_vm->getScreenWidth(), _vm->getScreenHeight());
Common::fill(&_tempPalette[0], &_tempPalette[Graphics::PALETTE_SIZE], 0);
Common::fill(&_manPal[0], &_manPal[0x84], 0);
+ Common::fill(&_stilPal[0], &_stilPal[99], 0);
Common::fill(&_scaleTable1[0], &_scaleTable1[256], 0);
Common::fill(&_scaleTable2[0], &_scaleTable2[256], 0);
_savedPaletteCount = 0;
diff --git a/engines/access/scripts.cpp b/engines/access/scripts.cpp
index 23f72fa9c2f..663f1387782 100644
--- a/engines/access/scripts.cpp
+++ b/engines/access/scripts.cpp
@@ -37,6 +37,7 @@ Scripts::Scripts(AccessEngine *vm) : Manager(vm) {
_sequence = 0;
_endFlag = false;
_continuenceType = 0;
+ _continuenceFlag = false;
_returnCode = 0;
_scriptCommand = 0;
_choice = 0;
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index bd468a05ab8..343774a4185 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -27,7 +27,8 @@
namespace Access {
VideoPlayer::VideoPlayer(AccessEngine *vm) : Manager(vm), _videoData(nullptr),
-_videoFrame(0), _soundFrame(0), _videoEnd(false), _soundFlag(false), _vidSurface(nullptr) {
+_videoFrame(0), _soundFrame(0), _videoEnd(false), _soundFlag(false),
+_vidSurface(nullptr) {
}
VideoPlayer::~VideoPlayer() {
@@ -242,7 +243,14 @@ void VideoPlayer_v1::copyVideo() {
//////////////////////////////////////////////////
VideoPlayer_v2::VideoPlayer_v2(AccessEngine *vm, bool setPal) : VideoPlayer(vm), _audioStream(nullptr),
-_frame(nullptr), _nextFrameTime(0), _setPal(setPal), _startMs(0), _drawBorder(false) {
+_frame(nullptr), _nextFrameTime(0), _setPal(setPal), _startMs(0), _drawBorder(false), _delayTotal(0)
+{
+ _header._id = 0;
+ _header._version = 0;
+ _header._frameCount = _header._frameIncr = 0;
+ _header._width = _header._height = 0;
+ _header._unk = 0;
+ _header._flags = VIDEOFLAG_NONE;
}
void VideoPlayer_v2::setVideo(const Common::Point &pt) {
Commit: 7986f452a1f9b097b3952dce0308174894c290e3
https://github.com/scummvm/scummvm/commit/7986f452a1f9b097b3952dce0308174894c290e3
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2026-05-25T21:32:26+10:00
Commit Message:
ACCESS: Remove redundant assignments. PVS-Studio V1048
Changed paths:
engines/access/noctropolis/noctropolis_game.cpp
engines/access/noctropolis/noctropolis_room.cpp
diff --git a/engines/access/noctropolis/noctropolis_game.cpp b/engines/access/noctropolis/noctropolis_game.cpp
index 5c183c60594..1024d7ccdeb 100644
--- a/engines/access/noctropolis/noctropolis_game.cpp
+++ b/engines/access/noctropolis/noctropolis_game.cpp
@@ -477,7 +477,6 @@ void NoctropolisEngine::doTravel() {
copyBF2Vid();
_screen->cyclePaletteForward();
- selectedLoc = -1;
rawMouse = _events->calcRawMouse();
int boxResult = _room->checkBoxes1(rawMouse);
diff --git a/engines/access/noctropolis/noctropolis_room.cpp b/engines/access/noctropolis/noctropolis_room.cpp
index 6efe620c1ae..eecec716f0f 100644
--- a/engines/access/noctropolis/noctropolis_room.cpp
+++ b/engines/access/noctropolis/noctropolis_room.cpp
@@ -47,7 +47,7 @@ void NoctropolisRoom::loadPlayer1() {
int numSubFiles = -1;
int objBase = -1;
int fileNum = -1;
- int palOffset = 6;
+ int palOffset;
if (!(_roomFlag & kRoomFlagTopView)) {
palOffset = 6;
if ((int8)_roomFlag > -1) {
More information about the Scummvm-git-logs
mailing list