[Scummvm-cvs-logs] SF.net SVN: scummvm: [23512] scummvm/trunk/engines/kyra/resource.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Jul 20 22:49:57 CEST 2006
Revision: 23512
http://svn.sourceforge.net/scummvm/?rev=23512&view=rev
Author: lordhoto
Date: 2006-07-15 13:32:54 -0700 (Sat, 15 Jul 2006)
Log Message:
-----------
Little cleanup.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/resource.cpp
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp 2006-07-15 20:30:36 UTC (rev 23511)
+++ scummvm/trunk/engines/kyra/resource.cpp 2006-07-15 20:32:54 UTC (rev 23512)
@@ -45,6 +45,10 @@
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 @@
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());
}
More information about the Scummvm-git-logs
mailing list