aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2008-03-20 11:55:52 +0000
committerJohannes Schickel2008-03-20 11:55:52 +0000
commite69532bff2f9d6e864f1183fd3db5008fc836097 (patch)
tree443bf22c4c85a801c6d069a39d224c447510c3c2
parente70790c610556cbf2ab96cdff03d447aaa76fa71 (diff)
downloadscummvm-rg350-e69532bff2f9d6e864f1183fd3db5008fc836097.tar.gz
scummvm-rg350-e69532bff2f9d6e864f1183fd3db5008fc836097.tar.bz2
scummvm-rg350-e69532bff2f9d6e864f1183fd3db5008fc836097.zip
Fixed loading of 'filedata.fdt' in HoF demo from Malcolm's Revenge CD.
svn-id: r31202
-rw-r--r--engines/kyra/resource.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index 11c48e04ed..d40ff0bae4 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -215,7 +215,12 @@ bool Resource::loadFileList(const Common::String &filedata) {
filename.toUppercase();
if (filename.hasSuffix(".PAK")) {
- if (!loadPakFile(filename)) {
+ if (!isAccessable(filename) && _vm->gameFlags().isDemo) {
+ // the demo version supplied with Kyra3 does not
+ // contain all pak files listed in filedata.fdt
+ // so we don't do anything here if they are non
+ // existant.
+ else if (!loadPakFile(filename)) {
error("couldn't load file '%s'", filename.c_str());
return false;
}