aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-01-03 14:49:52 +0000
committerTorbjörn Andersson2004-01-03 14:49:52 +0000
commitfa523f7f7ecbe844901d3b3f08456cea2541f0bc (patch)
tree28b425b1342a155b2994cc309f793d7f7fcb2255
parent069c21310f411ff8987573e450c473068bb9528e (diff)
downloadscummvm-rg350-fa523f7f7ecbe844901d3b3f08456cea2541f0bc.tar.gz
scummvm-rg350-fa523f7f7ecbe844901d3b3f08456cea2541f0bc.tar.bz2
scummvm-rg350-fa523f7f7ecbe844901d3b3f08456cea2541f0bc.zip
It was pointed out to me that we can't use the DEMO variable here, because
the missing file may be the one with the resource for the global variables. svn-id: r12112
-rw-r--r--sword2/resman.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/sword2/resman.cpp b/sword2/resman.cpp
index 9724bac46b..1826f88285 100644
--- a/sword2/resman.cpp
+++ b/sword2/resman.cpp
@@ -431,7 +431,7 @@ uint8 *ResourceManager::openResource(uint32 res, bool dump) {
// playing a demo, then we're in trouble if the file
// can't be found!
- if (DEMO || (_cdTab[parent_res_file] & LOCAL_PERM))
+ if ((_vm->_features & GF_DEMO) || (_cdTab[parent_res_file] & LOCAL_PERM))
error("Could not find '%s'", _resourceFiles[parent_res_file]);
getCd(_cdTab[parent_res_file] & 3);