diff options
author | Johannes Schickel | 2010-08-24 15:48:43 +0000 |
---|---|---|
committer | Johannes Schickel | 2010-08-24 15:48:43 +0000 |
commit | c23f597f50fdb0c4ee81a4f9de6e915b362afdc2 (patch) | |
tree | 6b639eefa01558c79867776f821071f2a026b1d5 /engines/kyra/resource.cpp | |
parent | 51939fe743fa0682a2a037352565dfb8d2aea4dd (diff) | |
download | scummvm-rg350-c23f597f50fdb0c4ee81a4f9de6e915b362afdc2.tar.gz scummvm-rg350-c23f597f50fdb0c4ee81a4f9de6e915b362afdc2.tar.bz2 scummvm-rg350-c23f597f50fdb0c4ee81a4f9de6e915b362afdc2.zip |
KYRA: Cleanup.
svn-id: r52348
Diffstat (limited to 'engines/kyra/resource.cpp')
-rw-r--r-- | engines/kyra/resource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index 31a49a0af9..63b8072654 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -153,7 +153,7 @@ bool Resource::loadPakFile(Common::String filename) { return loadPakFile(filename, file); } -bool Resource::loadPakFile(Common::String name, Common::SharedPtr<Common::ArchiveMember> file) { +bool Resource::loadPakFile(Common::String name, Common::ArchiveMemberPtr file) { name.toUppercase(); if (_archiveFiles.hasArchive(name) || _protectedFiles.hasArchive(name)) @@ -319,7 +319,7 @@ Common::SeekableReadStream *Resource::createReadStream(const Common::String &fil return _files.createReadStreamForMember(file); } -Common::Archive *Resource::loadArchive(const Common::String &name, Common::SharedPtr<Common::ArchiveMember> member) { +Common::Archive *Resource::loadArchive(const Common::String &name, Common::ArchiveMemberPtr member) { ArchiveMap::iterator cachedArchive = _archiveCache.find(name); if (cachedArchive != _archiveCache.end()) return cachedArchive->_value; |