[Scummvm-cvs-logs] SF.net SVN: scummvm: [25426] scummvm/trunk/engines/kyra/kyra3.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Thu Feb 8 10:41:11 CET 2007
Revision: 25426
http://scummvm.svn.sourceforge.net/scummvm/?rev=25426&view=rev
Author: lordhoto
Date: 2007-02-08 01:41:10 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
Don't rely on assert when calling functions.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra3.cpp
Modified: scummvm/trunk/engines/kyra/kyra3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra3.cpp 2007-02-08 09:24:33 UTC (rev 25425)
+++ scummvm/trunk/engines/kyra/kyra3.cpp 2007-02-08 09:41:10 UTC (rev 25426)
@@ -400,9 +400,12 @@
musicUpdate(0);
musicUpdate(0);
- assert(loadLanguageFile("ITEMS.", _itemList));
- assert(loadLanguageFile("C_CODE.", _cCodeFile));
- assert(loadLanguageFile("SCENES.", _scenesList));
+ if (!loadLanguageFile("ITEMS.", _itemList))
+ error("couldn't load ITEMS");
+ if (!loadLanguageFile("C_CODE.", _cCodeFile))
+ error("couldn't load C_CODE");
+ if (!loadLanguageFile("SCENES.", _scenesList))
+ error("couldn't load SCENES");
assert(_unkBuffer5 && _unkBuffer6 && _unkBuffer7 && _costpalData && _unkBuffer9 &&
_unkWSAPtr && _unkPage2 && _itemList && _cCodeFile && _scenesList);
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