AGOS: Slightly clean up ArchiveMan code.

This removes the (always true) _fallBack flag which determined whether SearchMan should be searched.
scummvm · Jan 21, 2014 · e560dca · e560dca
1 parent 0f36a56
commit e560dca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
@@ -191,8 +191,6 @@ class ArchiveMan : public Common::SearchSet {
 public:
 	ArchiveMan();
 
-	void enableFallback(bool val) { _fallBack = val; }
-
 #ifdef ENABLE_AGOS2
 	void registerArchive(const Common::String &filename, int priority);
 #endif
@@ -203,9 +201,6 @@ class ArchiveMan : public Common::SearchSet {
 
 	virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
 	virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &filename) const;
-
-private:
-	bool _fallBack;
 };
 
 class AGOSEngine : public Engine {

diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp
@@ -39,7 +39,6 @@
 namespace AGOS {
 
 ArchiveMan::ArchiveMan() {
-	_fallBack = true;
 }
 
 #ifdef ENABLE_AGOS2
@@ -52,32 +51,32 @@ void ArchiveMan::registerArchive(const Common::String &filename, int priority) {
 #endif
 
 bool ArchiveMan::hasFile(const Common::String &name) const {
-	if (_fallBack && SearchMan.hasFile(name))
+	if (SearchMan.hasFile(name))
 		return true;
 
 	return Common::SearchSet::hasFile(name);
 }
 
 int ArchiveMan::listMatchingMembers(Common::ArchiveMemberList &list, const Common::String &pattern) const {
-	const int matches = _fallBack ? SearchMan.listMatchingMembers(list, pattern) : 0;
+	const int matches = SearchMan.listMatchingMembers(list, pattern);
 	return matches + Common::SearchSet::listMatchingMembers(list, pattern);
 }
 
 int ArchiveMan::listMembers(Common::ArchiveMemberList &list) const {
-	const int matches = _fallBack ? SearchMan.listMembers(list) : 0;
+	const int matches = SearchMan.listMembers(list);
 	return matches + Common::SearchSet::listMembers(list);
 }
 
 const Common::ArchiveMemberPtr ArchiveMan::getMember(const Common::String &name) const {
-	Common::ArchiveMemberPtr ptr = _fallBack ? SearchMan.getMember(name) : Common::ArchiveMemberPtr();
+	Common::ArchiveMemberPtr ptr = SearchMan.getMember(name);
 	if (ptr)
 		return ptr;
 
 	return Common::SearchSet::getMember(name);
 }
 
 Common::SeekableReadStream *ArchiveMan::createReadStreamForMember(const Common::String &filename) const {
-	if (_fallBack && SearchMan.hasFile(filename)) {
+	if (SearchMan.hasFile(filename)) {
 		return SearchMan.createReadStreamForMember(filename);
 	}