[Scummvm-cvs-logs] SF.net SVN: scummvm:[35796] scummvm/trunk/engines/scumm/akos.cpp

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Fri Jan 9 13:08:07 CET 2009


Revision: 35796
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35796&view=rev
Author:   Kirben
Date:     2009-01-09 12:08:06 +0000 (Fri, 09 Jan 2009)

Log Message:
-----------
Switch assert to an error message, stating the exact unknown code.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/akos.cpp

Modified: scummvm/trunk/engines/scumm/akos.cpp
===================================================================
--- scummvm/trunk/engines/scumm/akos.cpp	2009-01-09 05:14:56 UTC (rev 35795)
+++ scummvm/trunk/engines/scumm/akos.cpp	2009-01-09 12:08:06 UTC (rev 35796)
@@ -1730,7 +1730,8 @@
 	if (code2 & 0x80)
 		code2 = READ_BE_UINT16(aksq + curpos);
 
-	assert((code2 & 0xC000) != 0xC000 || code2 == AKC_ComplexChan || code2 == AKC_Return || code2 == AKC_EndSeq || code2 == AKC_C08E || code2 == AKC_ComplexChan2 || code2 == AKC_C021 || code2 == AKC_C022);
+	if((code2 & 0xC000) == 0xC000 && code2 != AKC_ComplexChan && code2 != AKC_Return && code2 != AKC_EndSeq && code2 != AKC_C08E && code2 != AKC_ComplexChan2 && code2 != AKC_C021 && code2 != AKC_C022)
+		error("Ending with undefined uSweat token %X", code2);
 
 	a->_cost.curpos[chan] = curpos;
 


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