diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/kyra/resource.h | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/kyra/resource.h')
| -rw-r--r-- | engines/kyra/resource.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index d572c1ac54..8372bf9ad1 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -55,7 +55,7 @@ public: bool reset(); bool loadPakFile(Common::String filename); - bool loadPakFile(Common::String name, Common::SharedPtr<Common::ArchiveMember> file); + bool loadPakFile(Common::String name, Common::ArchiveMemberPtr file); void unloadPakFile(Common::String filename, bool remFromCache = false); @@ -86,7 +86,7 @@ protected: Common::SearchSet _archiveFiles; Common::SearchSet _protectedFiles; - Common::Archive *loadArchive(const Common::String &name, Common::SharedPtr<Common::ArchiveMember> member); + Common::Archive *loadArchive(const Common::String &name, Common::ArchiveMemberPtr member); Common::Archive *loadInstallerArchive(const Common::String &file, const Common::String &ext, const uint8 offset); bool loadProtectedFiles(const char * const * list); |