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

[mduggan]

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:
b8b6bca7cd ACCESS: Make video destructors explicit PVS-Studio 1053
8a219cf382 ACCESS: Add detection enum values for other games
b320897787 ACCESS: Remove impossible branch PVS-Studio V547


Commit: b8b6bca7cd555fecdb8e54456b012a307c50b82a
    https://github.com/scummvm/scummvm/commit/b8b6bca7cd555fecdb8e54456b012a307c50b82a
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2026-06-07T07:40:40+10:00

Commit Message:
ACCESS: Make video destructors explicit PVS-Studio 1053

Changed paths:
    engines/access/video.cpp
    engines/access/video.h


diff --git a/engines/access/video.cpp b/engines/access/video.cpp
index 343774a4185..56979a14830 100644
--- a/engines/access/video.cpp
+++ b/engines/access/video.cpp
@@ -32,7 +32,6 @@ _vidSurface(nullptr) {
 }
 
 VideoPlayer::~VideoPlayer() {
-	closeVideo();
 }
 
 void VideoPlayer::setVideo(BaseSurface *vidSurface, const Common::Point &pt, const Common::Path &filename, int rate) {
@@ -91,6 +90,9 @@ VideoPlayer_v1::VideoPlayer_v1(AccessEngine *vm) : VideoPlayer(vm) {
 	_header._flags = VIDEOFLAG_NONE;
 }
 
+VideoPlayer_v1::~VideoPlayer_v1() {
+	VideoPlayer_v1::closeVideo();
+}
 
 void VideoPlayer_v1::setVideo(const Common::Point &pt) {
 	_vidSurface->_orgX1 = pt.x;
@@ -253,6 +255,10 @@ _frame(nullptr), _nextFrameTime(0), _setPal(setPal), _startMs(0), _drawBorder(fa
 	_header._flags = VIDEOFLAG_NONE;
 }
 
+VideoPlayer_v2::~VideoPlayer_v2() {
+	VideoPlayer_v2::closeVideo();
+}
+
 void VideoPlayer_v2::setVideo(const Common::Point &pt) {
 	_header._id = _videoData->_stream->readUint32LE();
 	_header._version = _videoData->_stream->readByte();
diff --git a/engines/access/video.h b/engines/access/video.h
index 11afc220fb4..d3b92e7657c 100644
--- a/engines/access/video.h
+++ b/engines/access/video.h
@@ -111,6 +111,8 @@ protected:
 public:
 	VideoPlayer_v1(AccessEngine *vm);
 
+	~VideoPlayer_v1();
+
 	void playVideo() override;
 
 	void copyVideo() override;
@@ -160,6 +162,8 @@ protected:
 public:
 	VideoPlayer_v2(AccessEngine *vm, bool setPal = false);
 
+	~VideoPlayer_v2();
+
 	void playVideo() override;
 
 	void copyVideo() override {};


Commit: 8a219cf382a6c2c020e5b0731c6a0033f87fbfae
    https://github.com/scummvm/scummvm/commit/8a219cf382a6c2c020e5b0731c6a0033f87fbfae
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2026-06-07T07:40:43+10:00

Commit Message:
ACCESS: Add detection enum values for other games

We don't have table entries or support for these games yet, but it would be
nice to add support in the future.  Add some placeholder enum values for now.

Changed paths:
    engines/access/detection.h


diff --git a/engines/access/detection.h b/engines/access/detection.h
index 6c9f93aa63f..5857932b478 100644
--- a/engines/access/detection.h
+++ b/engines/access/detection.h
@@ -29,7 +29,9 @@ namespace Access {
 enum AccessGameType {
 	kGameAmazon = 1,
 	kGameMartianMemorandum = 2,
-	kGameNoctropolis = 3
+	kGameNoctropolis = 3,
+	kGameCountdown = 4,
+	kGameSynnergist = 5,
 };
 
 struct AccessGameDescription {


Commit: b320897787316d387e12eebb26d8cf5bb9e0b5de
    https://github.com/scummvm/scummvm/commit/b320897787316d387e12eebb26d8cf5bb9e0b5de
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2026-06-07T08:00:15+10:00

Commit Message:
ACCESS: Remove impossible branch PVS-Studio V547

This time read was added initially using the original header in PR7324, but
that PR was then updated to use the standard header format, so there should be
no saves in the wild with an older header but version > 1.  Even if there were
they would be rejected by the version check on line 617.

Changed paths:
    engines/access/access.cpp


diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index 4cfe81b9beb..9fb4964b70a 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -635,10 +635,6 @@ bool AccessEngine::readSavegameHeader(Common::InSaveFile *in, AccessSavegameHead
 	// Read Totalframes
 	header._totalFrames = in->readUint32LE();
 
-	// Read the Total PlayTime (if available)
-	if (header._version > 1)
-		header._totalPlayTime = in->readUint32LE();
-
 	return true;
 }