diff options
Diffstat (limited to 'engines/kyra/resource_intern.h')
| -rw-r--r-- | engines/kyra/resource_intern.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/engines/kyra/resource_intern.h b/engines/kyra/resource_intern.h index a3fbe9f1f9..6347c538fc 100644 --- a/engines/kyra/resource_intern.h +++ b/engines/kyra/resource_intern.h @@ -47,7 +47,7 @@ public: typedef Common::List<InputEntry> FileInputList; - PlainArchive(Resource *owner, const Common::String &filename, const FileInputList &files); + PlainArchive(Common::SharedPtr<Common::ArchiveMember> file, const FileInputList &files); bool hasFile(const Common::String &name); int listMembers(Common::ArchiveMemberList &list); @@ -60,8 +60,7 @@ private: typedef Common::HashMap<Common::String, Entry, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> FileMap; - Resource *_owner; - Common::String _filename; + Common::SharedPtr<Common::ArchiveMember> _file; FileMap _files; }; @@ -98,28 +97,28 @@ public: virtual ~ResArchiveLoader() {} virtual bool checkFilename(Common::String filename) const = 0; virtual bool isLoadable(const Common::String &filename, Common::SeekableReadStream &stream) const = 0; - virtual Common::Archive *load(Resource *owner, const Common::String &filename, Common::SeekableReadStream &stream) const = 0; + virtual Common::Archive *load(Common::SharedPtr<Common::ArchiveMember> file, Common::SeekableReadStream &stream) const = 0; }; class ResLoaderPak : public ResArchiveLoader { public: bool checkFilename(Common::String filename) const; bool isLoadable(const Common::String &filename, Common::SeekableReadStream &stream) const; - Common::Archive *load(Resource *owner, const Common::String &filename, Common::SeekableReadStream &stream) const; + Common::Archive *load(Common::SharedPtr<Common::ArchiveMember> file, Common::SeekableReadStream &stream) const; }; class ResLoaderInsMalcolm : public ResArchiveLoader { public: bool checkFilename(Common::String filename) const; bool isLoadable(const Common::String &filename, Common::SeekableReadStream &stream) const; - Common::Archive *load(Resource *owner, const Common::String &filename, Common::SeekableReadStream &stream) const; + Common::Archive *load(Common::SharedPtr<Common::ArchiveMember> file, Common::SeekableReadStream &stream) const; }; class ResLoaderTlk : public ResArchiveLoader { public: bool checkFilename(Common::String filename) const; bool isLoadable(const Common::String &filename, Common::SeekableReadStream &stream) const; - Common::Archive *load(Resource *owner, const Common::String &filename, Common::SeekableReadStream &stream) const; + Common::Archive *load(Common::SharedPtr<Common::ArchiveMember> file, Common::SeekableReadStream &stream) const; }; class InstallerLoader { |