diff options
| author | Johannes Schickel | 2008-09-07 22:35:13 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-09-07 22:35:13 +0000 |
| commit | 06d57a54f3b2ec623c085d0bcce76df4e3acd50d (patch) | |
| tree | 7c7e35cbe2d343c12b8f0d25a3c25bd0257c5bb2 /engines | |
| parent | bd10e674a3c5e7b3ac87aaa405565a3f532de52c (diff) | |
| download | scummvm-rg350-06d57a54f3b2ec623c085d0bcce76df4e3acd50d.tar.gz scummvm-rg350-06d57a54f3b2ec623c085d0bcce76df4e3acd50d.tar.bz2 scummvm-rg350-06d57a54f3b2ec623c085d0bcce76df4e3acd50d.zip | |
- Fixed regression in Resource::unloadPakFile
- Changed priority value for OSystem::addSysArchivesToSearchSet call
svn-id: r34436
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/kyra/resource.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index fe2b24e856..51ef9f3e81 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -40,7 +40,8 @@ Resource::Resource(KyraEngine_v1 *vm) : _archiveCache(), _files(), _archiveFiles Common::SharedPtr<Common::Archive> path(new Common::FSDirectory(ConfMan.get("path"))); Common::SharedPtr<Common::Archive> extrapath(new Common::FSDirectory(ConfMan.get("extrapath"))); - _vm->_system->addSysArchivesToSearchSet(_files); + + _vm->_system->addSysArchivesToSearchSet(_files, 3); _files.add("path", path, 3); _files.add("extrapath", extrapath, 3); // compressed installer archives are added at level '2', @@ -208,7 +209,8 @@ bool Resource::loadFileList(const char * const *filelist, uint32 numFiles) { void Resource::unloadPakFile(Common::String filename) { filename.toUppercase(); _archiveFiles->remove(filename); - _protectedFiles->remove(filename); + // We do not remove files from '_protectedFiles' here, since + // those are protected against unloading. } bool Resource::isInPakList(Common::String filename) { |