aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2006-07-15 20:32:54 +0000
committerJohannes Schickel2006-07-15 20:32:54 +0000
commitd630b3e722f58d008ead016f46fc8ae459fcb1db (patch)
treeb3e5ba170de349c3a0c2a9338cd19ba60c710f82 /engines
parent04503d462d43d49dd9504785477364ca18eecdb7 (diff)
downloadscummvm-rg350-d630b3e722f58d008ead016f46fc8ae459fcb1db.tar.gz
scummvm-rg350-d630b3e722f58d008ead016f46fc8ae459fcb1db.tar.bz2
scummvm-rg350-d630b3e722f58d008ead016f46fc8ae459fcb1db.zip
Little cleanup.
svn-id: r23512
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/resource.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index 5281f015c3..e0a9818891 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -45,6 +45,10 @@ Resource::Resource(KyraEngine *engine) {
error("couldn't open Kyrandia resource file ('KYRA.DAT') make sure you got one file for your version");
}
+ // We only need kyra.dat for the demo.
+ if (_engine->features() & GF_DEMO)
+ return;
+
// only VRM file we need in the *whole* game for kyra1
if (_engine->features() & GF_TALKIE) {
assert(loadPakFile("CHAPTER1.VRM"));
@@ -57,14 +61,10 @@ Resource::Resource(KyraEngine *engine) {
return;
_pakfiles.push_back(insFile);
}
-
- // We only need kyra.dat for the demo.
- if (_engine->features() & GF_DEMO)
- return;
-
+
FSList fslist;
FilesystemNode dir(ConfMan.get("path"));
-
+
if (!dir.listDir(fslist, FilesystemNode::kListFilesOnly)) {
error("invalid game path '%s'", dir.path().c_str());
}