Merge branch 'master' into mm

Conflicts:
	engines/access/access.cpp
	engines/access/asurface.h
	engines/access/bubble_box.cpp
	engines/access/bubble_box.h
	engines/access/martian/martian_game.cpp
	engines/access/player.cpp
	engines/access/player.h
	engines/access/resources.cpp
	engines/access/screen.cpp
	engines/access/screen.h
	engines/access/sound.cpp
	engines/access/sound.h

1 files changed, 9 insertions, 12 deletions

diff --git a/engines/zvision/file/search_manager.h b/engines/zvision/file/search_manager.h
index fdd70fd381..0d0ab14d31 100644
--- a/engines/zvision/file/search_manager.h
+++ b/engines/zvision/file/search_manager.h
@@ -39,33 +39,30 @@ public:
 
 	void addFile(const Common::String &name, Common::Archive *arch);
 	void addDir(const Common::String &name);
-	void addPatch(const Common::String &src, const Common::String &dst);
 
 	Common::File *openFile(const Common::String &name);
 	bool openFile(Common::File &file, const Common::String &name);
 	bool hasFile(const Common::String &name);
 
-	void loadZix(const Common::String &name);
-
-private:
-
-	void listDirRecursive(Common::List<Common::String> &dirList, const Common::FSNode &fsNode, int depth);
+	bool loadZix(const Common::String &name);
 
 	struct Node {
 		Common::String name;
 		Common::Archive *arch;
 	};
 
-	Common::List<Common::String> _dirList;
-
 	typedef Common::HashMap<Common::String, Node, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> MatchList;
 
-	Common::List<Common::Archive *> _archList;
-	MatchList _files;
-
-	Common::String _root;
+	void listMembersWithExtension(MatchList &fileList, Common::String extension);
 
 private:
+
+	void listDirRecursive(Common::List<Common::String> &dirList, const Common::FSNode &fsNode, int depth);
+
+	Common::List<Common::String> _dirList;
+	Common::List<Common::Archive *> _archList;
+	Common::String _root;
+	MatchList _files;
 };
 
 }