aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTravis Howell2009-01-09 12:08:06 +0000
committerTravis Howell2009-01-09 12:08:06 +0000
commit5bf899709c170638607f4e9bcf80960ec04e8f59 (patch)
tree7a750dc1ef482c27dfff9186ce669a8a9d025166 /engines/scumm
parent1e29a3c7d8acfa4dcede922225bfda7e67a53eab (diff)
downloadscummvm-rg350-5bf899709c170638607f4e9bcf80960ec04e8f59.tar.gz
scummvm-rg350-5bf899709c170638607f4e9bcf80960ec04e8f59.tar.bz2
scummvm-rg350-5bf899709c170638607f4e9bcf80960ec04e8f59.zip
Switch assert to an error message, stating the exact unknown code.
svn-id: r35796
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/akos.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp
index c9771abd49..1777caa84c 100644
--- a/engines/scumm/akos.cpp
+++ b/engines/scumm/akos.cpp
@@ -1730,7 +1730,8 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
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;