[Scummvm-cvs-logs] SF.net SVN: scummvm: [23513] scummvm/trunk/engines/kyra/resource.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Thu Jul 20 22:50:00 CEST 2006


Revision: 23513
          http://svn.sourceforge.net/scummvm/?rev=23513&view=rev
Author:   lordhoto
Date:     2006-07-15 13:37:32 -0700 (Sat, 15 Jul 2006)

Log Message:
-----------
Get rid of some asserts and adds error messages instead.

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:32:54 UTC (rev 23512)
+++ scummvm/trunk/engines/kyra/resource.cpp	2006-07-15 20:37:32 UTC (rev 23513)
@@ -51,7 +51,8 @@
 
 		// only VRM file we need in the *whole* game for kyra1
 		if (_engine->features() & GF_TALKIE) {
-			assert(loadPakFile("CHAPTER1.VRM"));
+			if !(loadPakFile("CHAPTER1.VRM"))
+				error("couldn't open pakfile 'CHAPTER1.VRM'");
 		}
 	} else if (_engine->game() == GI_KYRA3) {
 		// load the installation package file for kyra3
@@ -71,7 +72,9 @@
 
 	for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
 		if (file->displayName().hasSuffix("PAK") || file->displayName().hasSuffix("APK")) {
-			assert(loadPakFile(file->displayName()));
+			if (loadPakFile(file->displayName()) {
+				error("couldn't open pakfile '%s'", file->displayName().c_str());
+			}
 		}
 	}
 }






More information about the Scummvm-git-logs mailing list