Committed updated version of my patch #2184529 "SearchSet: Get rid of SharedPtr usage".

svn-id: r34837

3 files changed, 55 insertions, 46 deletions

diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index c3ab6e5e70..2b09036b4e 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -35,23 +35,22 @@
 
 namespace Kyra {
 
-Resource::Resource(KyraEngine_v1 *vm) : _archiveCache(), _files(), _archiveFiles(new Common::SearchSet()), _protectedFiles(new Common::SearchSet()), _loaders(), _vm(vm) {
+Resource::Resource(KyraEngine_v1 *vm) : _archiveCache(), _files(), _archiveFiles(), _protectedFiles(), _loaders(), _vm(vm) {
 	initializeLoaders();
 
-	Common::SharedPtr<Common::Archive> path(new Common::FSDirectory(ConfMan.get("path"), 2));
-	Common::SharedPtr<Common::Archive> extrapath(new Common::FSDirectory(ConfMan.get("extrapath")));
-
-	_files.add("path", path, 4);
-	_files.add("extrapath", extrapath, 4);
-	_vm->_system->addSysArchivesToSearchSet(_files, 3);
+	_files.add("global_search", &Common::SearchManager::instance(), 3, false);
 	// compressed installer archives are added at level '2',
 	// but that's done in Resource::reset not here
-	_files.add("protected", _protectedFiles, 1);
-	_files.add("archives", _archiveFiles, 0);
+	_files.add("protected", &_protectedFiles, 1, false);
+	_files.add("archives", &_archiveFiles, 0, false);
 }
 
 Resource::~Resource() {
 	_loaders.clear();
+
+	for (ArchiveMap::iterator i = _archiveCache.begin(); i != _archiveCache.end(); ++i)
+		delete i->_value;
+	_archiveCache.clear();
 }
 
 bool Resource::reset() {
@@ -68,7 +67,7 @@ bool Resource::reset() {
 			return true;
 	} else if (_vm->game() == GI_KYRA2) {
 		if (_vm->gameFlags().useInstallerPackage)
-			_files.add("installer", loadInstallerArchive("WESTWOOD", "%03d", 6), 2);
+			_files.add("installer", loadInstallerArchive("WESTWOOD", "%03d", 6), 2, false);
 
 		// mouse pointer, fonts, etc. required for initializing
 		if (_vm->gameFlags().isDemo && !_vm->gameFlags().isTalkie) {
@@ -91,7 +90,7 @@ bool Resource::reset() {
 		return true;
 	} else if (_vm->game() == GI_LOL) {
 		if (_vm->gameFlags().useInstallerPackage)
-			_files.add("installer", loadInstallerArchive("WESTWOOD", "%d", 0), 2);
+			_files.add("installer", loadInstallerArchive("WESTWOOD", "%d", 0), 2, false);
 
 		return true;
 	}
@@ -114,9 +113,9 @@ bool Resource::reset() {
 			if (fileList.empty())
 				error("Couldn't load PAK file '%s'", list[i]);
 
-			Common::ArchivePtr archive = loadArchive(list[i], *fileList.begin());
+			Common::Archive *archive = loadArchive(list[i], *fileList.begin());
 			if (archive)
-				_protectedFiles->add(list[i], archive, 0);
+				_protectedFiles.add(list[i], archive, 0, false);
 		}
 	} else {
 		for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
@@ -155,14 +154,14 @@ bool Resource::loadPakFile(Common::String filename) {
 bool Resource::loadPakFile(Common::String name, Common::SharedPtr<Common::ArchiveMember> file) {
 	name.toUppercase();
 
-	if (_archiveFiles->hasArchive(name) || _protectedFiles->hasArchive(name))
+	if (_archiveFiles.hasArchive(name) || _protectedFiles.hasArchive(name))
 		return true;
 
-	Common::ArchivePtr archive = loadArchive(name, file);
+	Common::Archive *archive = loadArchive(name, file);
 	if (!archive)
 		return false;
 
-	_archiveFiles->add(name, archive, 0);
+	_archiveFiles.add(name, archive, 0, false);
 
 	return true;
 }
@@ -220,16 +219,24 @@ bool Resource::loadFileList(const char * const *filelist, uint32 numFiles) {
 
 void Resource::unloadPakFile(Common::String filename, bool remFromCache) {
 	filename.toUppercase();
-	_archiveFiles->remove(filename);
-	if (remFromCache)
-		_archiveCache.erase(filename);
+
 	// We do not remove files from '_protectedFiles' here, since
 	// those are protected against unloading.
+	if (_archiveFiles.hasArchive(filename)) {
+		_archiveFiles.remove(filename);
+		if (remFromCache) {
+			ArchiveMap::iterator iter = _archiveCache.find(filename);
+			if (iter != _archiveCache.end()) {
+				delete iter->_value;
+				_archiveCache.erase(filename);
+			}
+		}
+	}
 }
 
 bool Resource::isInPakList(Common::String filename) {
 	filename.toUppercase();
-	return (_archiveFiles->hasArchive(filename) || _protectedFiles->hasArchive(filename));
+	return (_archiveFiles.hasArchive(filename) || _protectedFiles.hasArchive(filename));
 }
 
 bool Resource::isInCacheList(Common::String name) {
@@ -238,8 +245,8 @@ bool Resource::isInCacheList(Common::String name) {
 }
 
 void Resource::unloadAllPakFiles() {
-	_archiveFiles->clear();
-	_protectedFiles->clear();
+	_archiveFiles.clear();
+	_protectedFiles.clear();
 }
 
 void Resource::listFiles(const Common::String &pattern, Common::ArchiveMemberList &list) {
@@ -294,7 +301,7 @@ Common::SeekableReadStream *Resource::getFileStream(const Common::String &file)
 	return _files.openFile(file);
 }
 
-Common::ArchivePtr Resource::loadArchive(const Common::String &name, Common::SharedPtr<Common::ArchiveMember> member) {
+Common::Archive *Resource::loadArchive(const Common::String &name, Common::SharedPtr<Common::ArchiveMember> member) {
 	ArchiveMap::iterator cachedArchive = _archiveCache.find(name);
 	if (cachedArchive != _archiveCache.end())
 		return cachedArchive->_value;
@@ -302,14 +309,14 @@ Common::ArchivePtr Resource::loadArchive(const Common::String &name, Common::Sha
 	Common::SeekableReadStream *stream = member->open();
 
 	if (!stream)
-		return Common::ArchivePtr();
+		return 0;
 
-	Common::ArchivePtr archive;
+	Common::Archive *archive = 0;
 	for (LoaderList::const_iterator i = _loaders.begin(); i != _loaders.end(); ++i) {
 		if ((*i)->checkFilename(name)) {
 			if ((*i)->isLoadable(name, *stream)) {
 				stream->seek(0, SEEK_SET);
-				archive = Common::ArchivePtr((*i)->load(member, *stream));
+				archive = (*i)->load(member, *stream);
 				break;
 			} else {
 				stream->seek(0, SEEK_SET);
@@ -320,20 +327,20 @@ Common::ArchivePtr Resource::loadArchive(const Common::String &name, Common::Sha
 	delete stream;
 
 	if (!archive)
-		return Common::ArchivePtr();
+		return 0;
 
 	_archiveCache[name] = archive;
 	return archive;
 }
 
-Common::ArchivePtr Resource::loadInstallerArchive(const Common::String &file, const Common::String &ext, const uint8 offset) {
+Common::Archive *Resource::loadInstallerArchive(const Common::String &file, const Common::String &ext, const uint8 offset) {
 	ArchiveMap::iterator cachedArchive = _archiveCache.find(file);
 	if (cachedArchive != _archiveCache.end())
 		return cachedArchive->_value;
 
-	Common::ArchivePtr archive(InstallerLoader::load(this, file, ext, offset));
+	Common::Archive *archive = InstallerLoader::load(this, file, ext, offset);
 	if (!archive)
-		return Common::ArchivePtr();
+		return 0;
 
 	_archiveCache[file] = archive;
 	return archive;
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 0831acaed6..72846e273a 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -55,8 +55,11 @@ public:
 
 	bool loadPakFile(Common::String filename);
 	bool loadPakFile(Common::String name, Common::SharedPtr<Common::ArchiveMember> file);
+
 	void unloadPakFile(Common::String filename, bool remFromCache = false);
+
 	bool isInPakList(Common::String filename);
+
 	bool isInCacheList(Common::String name);
 
 	bool loadFileList(const Common::String &filedata);
@@ -75,15 +78,15 @@ public:
 
 	bool loadFileToBuf(const char *file, void *buf, uint32 maxSize);
 protected:
-	typedef Common::HashMap<Common::String, Common::ArchivePtr, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> ArchiveMap;
+	typedef Common::HashMap<Common::String, Common::Archive*, Common::CaseSensitiveString_Hash, Common::CaseSensitiveString_EqualTo> ArchiveMap;
 	ArchiveMap _archiveCache;
 
 	Common::SearchSet _files;
-	Common::SharedPtr<Common::SearchSet> _archiveFiles;
-	Common::SharedPtr<Common::SearchSet> _protectedFiles;
+	Common::SearchSet _archiveFiles;
+	Common::SearchSet _protectedFiles;
 
-	Common::ArchivePtr loadArchive(const Common::String &name, Common::SharedPtr<Common::ArchiveMember> member);
-	Common::ArchivePtr loadInstallerArchive(const Common::String &file, const Common::String &ext, const uint8 offset);
+	Common::Archive *loadArchive(const Common::String &name, Common::SharedPtr<Common::ArchiveMember> member);
+	Common::Archive *loadInstallerArchive(const Common::String &file, const Common::String &ext, const uint8 offset);
 
 	void initializeLoaders();
 
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index 5d36076549..20b1370796 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -129,8 +129,7 @@ Common::String DosDisk_br::selectArchive(const Common::String& name) {
 
 	debugC(5, kDebugDisk, "DosDisk_br::selectArchive: adding part directory to search set");
 	_sset.remove("part");
-	Common::SharedPtr<Common::FSDirectory> partDir(_baseDir->getSubDirectory(name, 3));
-	_sset.add("part", partDir, 10);
+	_sset.add("part", _baseDir->getSubDirectory(name, 3), 10);
 
 	return oldPath;
 }
@@ -149,7 +148,8 @@ void DosDisk_br::init() {
 	// TODO: clarify whether the engine or OSystem should add the base game directory to the search manager.
 	// Right now, I am keeping an internal search set to do the job.
 	_baseDir = Common::SharedPtr<Common::FSDirectory>(new Common::FSDirectory(ConfMan.get("path")));
-	_sset.add("base", _baseDir, 5);
+	// FIXME: We use this gross hack here since we switched SearchSet to accept plain pointers
+	_sset.add("base", _baseDir.get(), 5, false);
 }
 
 
@@ -392,7 +392,8 @@ void DosDemoDisk_br::init() {
 	// TODO: clarify whether the engine or OSystem should add the base game directory to the search manager.
 	// Right now, I am keeping an internal search set to do the job.
 	_baseDir = Common::SharedPtr<Common::FSDirectory>(new Common::FSDirectory(ConfMan.get("path"), 2));
-	_sset.add("base", _baseDir, 5);
+	// FIXME: We use this gross hack here since we switched SearchSet to accept plain pointers
+	_sset.add("base", _baseDir.get(), 5, false);
 }
 
 
@@ -413,14 +414,13 @@ AmigaDisk_br::AmigaDisk_br(Parallaction *vm) : DosDisk_br(vm) {
 
 void AmigaDisk_br::init() {
 	_baseDir = Common::SharedPtr<Common::FSDirectory>(new Common::FSDirectory(ConfMan.get("path")));
-	_sset.add("base", _baseDir, 5);
+	// FIXME: We use this gross hack here since we switched SearchSet to accept plain pointers
+	_sset.add("base", _baseDir.get(), 5, false);
 
 	const Common::String subDirNames[3] = { "fonts", "backs", "common" };
 	const Common::String subDirPrefixes[3] = { "fonts", "backs", Common::String::emptyString };
-	for (int i = 0; i < 3; i++) {
-		Common::SharedPtr<Common::Archive> subDir(_baseDir->getSubDirectory(subDirPrefixes[i], subDirNames[i], 2));
-		_sset.add(subDirNames[i], subDir, 6);
-	}
+	for (int i = 0; i < 3; i++)
+		_sset.add(subDirNames[i], _baseDir->getSubDirectory(subDirPrefixes[i], subDirNames[i], 2), 6);
 }
 
 AmigaDisk_br::~AmigaDisk_br() {
@@ -623,8 +623,7 @@ Common::String AmigaDisk_br::selectArchive(const Common::String& name) {
 
 	debugC(5, kDebugDisk, "AmigaDisk_br::selectArchive: adding part directory to search set");
 	_sset.remove("part");
-	Common::SharedPtr<Common::FSDirectory> partDir(_baseDir->getSubDirectory(name, 3));
-	_sset.add("part", partDir, 10);
+	_sset.add("part", _baseDir->getSubDirectory(name, 3), 10);
 
 	return oldPath;
 }