From d630b3e722f58d008ead016f46fc8ae459fcb1db Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sat, 15 Jul 2006 20:32:54 +0000 Subject: [PATCH] Little cleanup. svn-id: r23512 --- engines/kyra/resource.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index 5281f015c3f..e0a9818891b 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()); }