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

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a5376d706f NGI: Don't reopen the NGIArchive when reading a content


Commit: a5376d706f05ff6a859150cd12a41a147c0a89c1
    https://github.com/scummvm/scummvm/commit/a5376d706f05ff6a859150cd12a41a147c0a89c1
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-01-26T15:11:19+01:00

Commit Message:
NGI: Don't reopen the NGIArchive when reading a content

This makes the game perform poorly with Android SAF.
The file is open once at the init and we then seek in it to look for
contents.
It's how it works for other archives like Zip.

In the same time, cleanup the headers.

Changed paths:
    engines/ngi/ngiarchive.cpp
    engines/ngi/ngiarchive.h


diff --git a/engines/ngi/ngiarchive.cpp b/engines/ngi/ngiarchive.cpp
index a534d60ae1a..08419843fca 100644
--- a/engines/ngi/ngiarchive.cpp
+++ b/engines/ngi/ngiarchive.cpp
@@ -32,21 +32,21 @@
 
 namespace NGI {
 
-NGIArchive::NGIArchive(const Common::Path &filename) : _ngiFilename(filename) {
-	Common::File ngiFile;
-
-	if (!ngiFile.open(_ngiFilename)) {
+NGIArchive::NGIArchive(const Common::Path &filename) : _ngiFile(new Common::File()) {
+	if (!_ngiFile->open(filename)) {
 		warning("NGIArchive::NGIArchive(): Could not find the archive file");
+		delete _ngiFile;
+		_ngiFile = nullptr;
 		return;
 	}
 
-	ngiFile.seek(4, SEEK_SET);
+	_ngiFile->seek(4, SEEK_SET);
 
-	unsigned int count = ngiFile.readUint16LE(); // How many entries?
+	unsigned int count = _ngiFile->readUint16LE(); // How many entries?
 
-	ngiFile.seek(20, SEEK_SET);
+	_ngiFile->seek(20, SEEK_SET);
 
-	unsigned int key = ngiFile.readUint16LE();
+	unsigned int key = _ngiFile->readUint16LE();
 
 	byte key1, key2;
 
@@ -55,11 +55,11 @@ NGIArchive::NGIArchive(const Common::Path &filename) : _ngiFilename(filename) {
 
 	int fatSize = count * 32;
 
-	ngiFile.seek(32, SEEK_SET);
+	_ngiFile->seek(32, SEEK_SET);
 
 	byte *fat = (byte *)calloc(fatSize, 1);
 
-	ngiFile.read(fat, fatSize);
+	_ngiFile->read(fat, fatSize);
 
 	for (int i = 0; i < fatSize; i++) {
 		key1 = (key1 << 1) ^ key2;
@@ -97,6 +97,8 @@ NGIArchive::NGIArchive(const Common::Path &filename) : _ngiFilename(filename) {
 NGIArchive::~NGIArchive() {
 	debugC(0, kDebugLoading, "NGIArchive Destructor Called");
 	g_nmi->_currArchive = nullptr;
+
+	delete _ngiFile;
 }
 
 bool NGIArchive::hasFile(const Common::Path &path) const {
@@ -123,20 +125,18 @@ const Common::ArchiveMemberPtr NGIArchive::getMember(const Common::Path &path) c
 }
 
 Common::SeekableReadStream *NGIArchive::createReadStreamForMember(const Common::Path &path) const {
-	if (!_headers.contains(path)) {
+	if (!_ngiFile || !_headers.contains(path)) {
 		return nullptr;
 	}
 
 	NgiHeader *hdr = _headers[path].get();
 
-	Common::File archiveFile;
-	archiveFile.open(_ngiFilename);
-	archiveFile.seek(hdr->pos, SEEK_SET);
+	_ngiFile->seek(hdr->pos, SEEK_SET);
 
 	byte *data = (byte *)malloc(hdr->size);
 	assert(data);
 
-	int32 len = archiveFile.read(data, hdr->size);
+	int32 len = _ngiFile->read(data, hdr->size);
 	assert(len == hdr->size);
 
 	return new Common::MemoryReadStream(data, hdr->size, DisposeAfterUse::YES);
diff --git a/engines/ngi/ngiarchive.h b/engines/ngi/ngiarchive.h
index 50281fd3aa7..60312f0588f 100644
--- a/engines/ngi/ngiarchive.h
+++ b/engines/ngi/ngiarchive.h
@@ -22,12 +22,13 @@
 #ifndef NGI_NGIARCHIVE_H
 #define NGI_NGIARCHIVE_H
 
-#include "common/path.h"
-#include "common/ptr.h"
+#include "common/archive.h"
 
-namespace NGI {
+namespace Common {
+class File;
+}
 
-class Archive;
+namespace NGI {
 
 #define NGI_FILENAME_MAX 13
 
@@ -43,7 +44,7 @@ typedef Common::HashMap<Common::Path, Common::ScopedPtr<NgiHeader>, Common::Path
 
 class NGIArchive : public Common::Archive {
 	NgiHeadersMap _headers;
-	Common::Path _ngiFilename;
+	Common::File *_ngiFile;
 
 public:
 	NGIArchive(const Common::Path &name);