[Scummvm-cvs-logs] SF.net SVN: scummvm: [25522] scummvm/trunk/engines/agos/gfx.cpp

[kirben at users.sourceforge.net]

Revision: 25522
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25522&view=rev
Author:   kirben
Date:     2007-02-12 05:29:41 -0800 (Mon, 12 Feb 2007)

Log Message:
-----------
Change asserts to warnings to now, due to code differences in Amiga versions of Simon the Sorcerer.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/gfx.cpp

Modified: scummvm/trunk/engines/agos/gfx.cpp
===================================================================
--- scummvm/trunk/engines/agos/gfx.cpp	2007-02-12 12:54:08 UTC (rev 25521)
+++ scummvm/trunk/engines/agos/gfx.cpp	2007-02-12 13:29:41 UTC (rev 25522)
@@ -958,7 +958,11 @@
 				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 @@
 				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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.