[Scummvm-cvs-logs] SF.net SVN: scummvm: [31202] scummvm/trunk/engines/kyra/resource.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Mar 20 12:55:53 CET 2008
Revision: 31202
http://scummvm.svn.sourceforge.net/scummvm/?rev=31202&view=rev
Author: lordhoto
Date: 2008-03-20 04:55:52 -0700 (Thu, 20 Mar 2008)
Log Message:
-----------
Fixed loading of 'filedata.fdt' in HoF demo from Malcolm's Revenge CD.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/resource.cpp
Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp 2008-03-20 11:42:02 UTC (rev 31201)
+++ scummvm/trunk/engines/kyra/resource.cpp 2008-03-20 11:55:52 UTC (rev 31202)
@@ -215,7 +215,12 @@
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;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list