diff options
author | Travis Howell | 2007-02-12 13:29:41 +0000 |
---|---|---|
committer | Travis Howell | 2007-02-12 13:29:41 +0000 |
commit | 6654a91ae2c6e3f81edac118c6bd384337f33462 (patch) | |
tree | db5916150370004d826208d0f8d84b3443d84a52 /engines/agos | |
parent | 82e4318b021d58fec6b5ae2cc7c74d8ad503561d (diff) | |
download | scummvm-rg350-6654a91ae2c6e3f81edac118c6bd384337f33462.tar.gz scummvm-rg350-6654a91ae2c6e3f81edac118c6bd384337f33462.tar.bz2 scummvm-rg350-6654a91ae2c6e3f81edac118c6bd384337f33462.zip |
Change asserts to warnings to now, due to code differences in Amiga versions of Simon the Sorcerer.
svn-id: r25522
Diffstat (limited to 'engines/agos')
-rw-r--r-- | engines/agos/gfx.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp index f5727b5b90..211005385e 100644 --- a/engines/agos/gfx.cpp +++ b/engines/agos/gfx.cpp @@ -958,7 +958,11 @@ void AGOSEngine::animate(uint windowNum, uint zoneNum, uint vgaSpriteId, uint x, break; p += sizeof(AnimationHeader_Simon); } - assert(READ_BE_UINT16(&((AnimationHeader_Simon *) p)->id) == vgaSpriteId); + + if (READ_BE_UINT16(&((AnimationHeader_Simon *) p)->id) != vgaSpriteId) { + debug(0, "setImage: Animation %d not found.", vgaSpriteId); + return; + } } else { p = pp + READ_BE_UINT16(pp + 10); p += 20; @@ -1068,7 +1072,12 @@ void AGOSEngine::setImage(uint16 vga_res_id, bool vgaScript) { break; b += sizeof(ImageHeader_Simon); } - assert(READ_BE_UINT16(&((ImageHeader_Simon *) b)->id) == vga_res_id); + + + if (READ_BE_UINT16(&((ImageHeader_Simon *) b)->id) != vga_res_id) { + debug(0, "setImage: Image %d not found.", vga_res_id); + return; + } } else { b = bb + READ_BE_UINT16(bb + 10); b += 20; |