From 06d57a54f3b2ec623c085d0bcce76df4e3acd50d Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 7 Sep 2008 22:35:13 +0000 Subject: - Fixed regression in Resource::unloadPakFile - Changed priority value for OSystem::addSysArchivesToSearchSet call svn-id: r34436 --- engines/kyra/resource.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'engines') 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 path(new Common::FSDirectory(ConfMan.get("path"))); Common::SharedPtr 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) { -- cgit v1.2.3