[Scummvm-cvs-logs] SF.net SVN: scummvm:[33636] scummvm/branches/branch-0-12-0/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 33636
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33636&view=rev
Author:   lordhoto
Date:     2008-08-05 12:16:41 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
Backport of r33635: Output errors on (some) missing files.

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/engines/kyra/kyra_hof.cpp
    scummvm/branches/branch-0-12-0/engines/kyra/resource.cpp

Modified: scummvm/branches/branch-0-12-0/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/kyra/kyra_hof.cpp	2008-08-05 12:13:01 UTC (rev 33635)
+++ scummvm/branches/branch-0-12-0/engines/kyra/kyra_hof.cpp	2008-08-05 12:16:41 UTC (rev 33636)
@@ -292,10 +292,12 @@
 	if (_menuChoice != 4) {
 		// load just the pak files needed for ingame
 		_res->loadPakFile(StaticResource::staticDataFilename());
-		if (_flags.platform == Common::kPlatformPC && _flags.isTalkie)
-			_res->loadFileList("FILEDATA.FDT");
-		else
+		if (_flags.platform == Common::kPlatformPC && _flags.isTalkie) {
+			if (!_res->loadFileList("FILEDATA.FDT"))
+				error("couldn't load 'FILEDATA.FDT'");
+		} else {
 			_res->loadFileList(_ingamePakList, _ingamePakListSize);
+		}
 
 		if (_flags.platform == Common::kPlatformPC98)
 			_res->loadPakFile("AUDIO.PAK");

Modified: scummvm/branches/branch-0-12-0/engines/kyra/resource.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/kyra/resource.cpp	2008-08-05 12:13:01 UTC (rev 33635)
+++ scummvm/branches/branch-0-12-0/engines/kyra/resource.cpp	2008-08-05 12:16:41 UTC (rev 33636)
@@ -89,14 +89,17 @@
 
 		return true;
 	} else if (_vm->game() == GI_KYRA3) {
-		if (_vm->gameFlags().useInstallerPackage)
-			loadPakFile("WESTWOOD.001");
+		if (_vm->gameFlags().useInstallerPackage) {
+			if (!loadPakFile("WESTWOOD.001"))
+				error("couldn't load file: 'WESTWOOD.001'");
+		}
 
 		// Add default file directories
 		Common::File::addDefaultDirectory(ConfMan.get("path") + "malcolm");
 		Common::File::addDefaultDirectory(ConfMan.get("path") + "MALCOLM");
 
-		loadFileList("FILEDATA.FDT");
+		if (!loadFileList("FILEDATA.FDT"))
+			error("couldn't load file: 'FILEDATA.FDT'");
 
 		return true;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.