diff options
| author | Johannes Schickel | 2012-01-27 20:04:40 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2012-01-27 20:10:31 +0100 |
| commit | a7cc5bd301bd0d5c55390de8c421eff91a8458b5 (patch) | |
| tree | 66b6843fc784a17b96c379ca7c40d59f994c5886 /engines | |
| parent | 0fd9abfe01d517c12b6855b6777a7e062ec1cc78 (diff) | |
| download | scummvm-rg350-a7cc5bd301bd0d5c55390de8c421eff91a8458b5.tar.gz scummvm-rg350-a7cc5bd301bd0d5c55390de8c421eff91a8458b5.tar.bz2 scummvm-rg350-a7cc5bd301bd0d5c55390de8c421eff91a8458b5.zip | |
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.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/agos/agos.h | 2 | ||||
| -rw-r--r-- | engines/agos/res.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/agos/agos.h b/engines/agos/agos.h index 03feafa70f..d171902133 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 62197340d2..284b252d91 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; |