[Scummvm-cvs-logs] scummvm master -> a7cc5bd301bd0d5c55390de8c421eff91a8458b5

lordhoto lordhoto at gmail.com
Fri Jan 27 20:11:41 CET 2012


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:
a7cc5bd301 AGOS: Properly overwrite hasFile from SearchSet in ArchiveMan.


Commit: a7cc5bd301bd0d5c55390de8c421eff91a8458b5
    https://github.com/scummvm/scummvm/commit/a7cc5bd301bd0d5c55390de8c421eff91a8458b5
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-27T11:10:31-08:00

Commit Message:
AGOS: Properly overwrite hasFile from SearchSet in ArchiveMan.

Formerly the hasFile method was non-const, thus did not overwrite the virtual
hasFile method of SearchSet. Since all accesses to this function have been
done through a ArchiveMan typed variable, the missing overwrite should not
have caused any trouble.

It looks like this was forgotten in a6ec4f70da120a1ce406ed4dd9e149e081542f59.

Changed paths:
    engines/agos/agos.h
    engines/agos/res.cpp



diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 03feafa..d171902 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -197,7 +197,7 @@ public:
 	void registerArchive(const Common::String &filename, int priority);
 #endif
 
-	bool hasFile(const Common::String &name);
+	virtual bool hasFile(const Common::String &name) const;
 	Common::SeekableReadStream *open(const Common::String &filename);
 
 private:
diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp
index 6219734..284b252 100644
--- a/engines/agos/res.cpp
+++ b/engines/agos/res.cpp
@@ -47,7 +47,7 @@ void ArchiveMan::registerArchive(const Common::String &filename, int priority) {
 }
 #endif
 
-bool ArchiveMan::hasFile(const Common::String &name) {
+bool ArchiveMan::hasFile(const Common::String &name) const {
 	if (_fallBack && SearchMan.hasFile(name))
 		return true;
 






More information about the Scummvm-git-logs mailing list