[Scummvm-git-logs] scummvm master -> 0b36547b1011d7d23bf76b9e38679a81f70ad15a
lephilousophe
noreply at scummvm.org
Mon Jul 27 05:54:37 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:
0b36547b10 SCUMM: Move ScummPAKFile detection in the engine dedicated source file
Commit: 0b36547b1011d7d23bf76b9e38679a81f70ad15a
https://github.com/scummvm/scummvm/commit/0b36547b1011d7d23bf76b9e38679a81f70ad15a
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-07-27T07:52:28+02:00
Commit Message:
SCUMM: Move ScummPAKFile detection in the engine dedicated source file
This should fix a spurious build issue when building with dynamic
detection and when the compiler tries to instantiate to generate the
destructor for a reason I ignore.
Changed paths:
engines/scumm/file.h
engines/scumm/file_engine.cpp
diff --git a/engines/scumm/file.h b/engines/scumm/file.h
index 4e90cbcd292..c6d0b23ddb8 100644
--- a/engines/scumm/file.h
+++ b/engines/scumm/file.h
@@ -173,7 +173,7 @@ private:
public:
ScummPAKFile(const ScummEngine *vm, bool indexFiles = true);
- ~ScummPAKFile() override { _pakIndex.clear(); }
+ ~ScummPAKFile() override;
bool openSubFile(const Common::Path &filePath) override;
PAKFile *getPAKFileIndex(Common::String fileName);
diff --git a/engines/scumm/file_engine.cpp b/engines/scumm/file_engine.cpp
index 8e2b833d421..ba1ee651165 100644
--- a/engines/scumm/file_engine.cpp
+++ b/engines/scumm/file_engine.cpp
@@ -225,6 +225,10 @@ ScummPAKFile::ScummPAKFile(const ScummEngine *vm, bool indexFiles) : ScummFile(v
readIndex(vm->_containerFile, vm->_game.id == GID_FT);
}
+ScummPAKFile::~ScummPAKFile() {
+ _pakIndex.clear();
+}
+
void ScummPAKFile::readIndex(const Common::Path &containerFile, bool isFT) {
// Based off DoubleFine Explorer: https://github.com/bgbennyboy/DoubleFine-Explorer/blob/master/uDFExplorer_LPAKManager.pas
ScummFile::open(containerFile);
More information about the Scummvm-git-logs
mailing list