diff options
author | Max Horn | 2009-01-23 04:45:44 +0000 |
---|---|---|
committer | Max Horn | 2009-01-23 04:45:44 +0000 |
commit | 14c5bbbccf30f333b92092ca55063b338335c3a5 (patch) | |
tree | 80cfc99351a2333461bbbb6e9437780921ad2edb /engines/kyra | |
parent | 9861afd8fde386ffc740ab12fad26f2d41213821 (diff) | |
download | scummvm-rg350-14c5bbbccf30f333b92092ca55063b338335c3a5.tar.gz scummvm-rg350-14c5bbbccf30f333b92092ca55063b338335c3a5.tar.bz2 scummvm-rg350-14c5bbbccf30f333b92092ca55063b338335c3a5.zip |
Renamed Archive::openFile to createReadStreamForMember
svn-id: r36021
Diffstat (limited to 'engines/kyra')
-rw-r--r-- | engines/kyra/resource.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/resource_intern.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/resource_intern.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index e319b89023..6e1623e984 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -311,7 +311,7 @@ bool Resource::loadFileToBuf(const char *file, void *buf, uint32 maxSize) { } Common::SeekableReadStream *Resource::getFileStream(const Common::String &file) { - return _files.openFile(file); + return _files.createReadStreamForMember(file); } Common::Archive *Resource::loadArchive(const Common::String &name, Common::SharedPtr<Common::ArchiveMember> member) { diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp index 68a4a55886..4f435e8927 100644 --- a/engines/kyra/resource_intern.cpp +++ b/engines/kyra/resource_intern.cpp @@ -69,7 +69,7 @@ Common::ArchiveMemberPtr PlainArchive::getMember(const Common::String &name) { return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this)); } -Common::SeekableReadStream *PlainArchive::openFile(const Common::String &name) const { +Common::SeekableReadStream *PlainArchive::createReadStreamForMember(const Common::String &name) const { FileMap::const_iterator fDesc = _files.find(name); if (fDesc == _files.end()) return 0; @@ -124,7 +124,7 @@ Common::ArchiveMemberPtr CachedArchive::getMember(const Common::String &name) { return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this)); } -Common::SeekableReadStream *CachedArchive::openFile(const Common::String &name) const { +Common::SeekableReadStream *CachedArchive::createReadStreamForMember(const Common::String &name) const { FileMap::const_iterator fDesc = _files.find(name); if (fDesc == _files.end()) return 0; diff --git a/engines/kyra/resource_intern.h b/engines/kyra/resource_intern.h index 6f16a2ba8e..4f15985dd2 100644 --- a/engines/kyra/resource_intern.h +++ b/engines/kyra/resource_intern.h @@ -52,7 +52,7 @@ public: bool hasFile(const Common::String &name); int listMembers(Common::ArchiveMemberList &list); Common::ArchiveMemberPtr getMember(const Common::String &name); - Common::SeekableReadStream *openFile(const Common::String &name) const; + Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const; private: struct Entry { uint32 offset; @@ -82,7 +82,7 @@ public: bool hasFile(const Common::String &name); int listMembers(Common::ArchiveMemberList &list); Common::ArchiveMemberPtr getMember(const Common::String &name); - Common::SeekableReadStream *openFile(const Common::String &name) const; + Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const; private: struct Entry { byte *data; |