[Scummvm-cvs-logs] SF.net SVN: scummvm: [30369] scummvm/trunk/engines/saga/sprite.cpp

[thebluegr at users.sourceforge.net]

Revision: 30369
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30369&view=rev
Author:   thebluegr
Date:     2008-01-10 02:34:23 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
Changed an assertion to a warning

Modified Paths:
--------------
    scummvm/trunk/engines/saga/sprite.cpp

Modified: scummvm/trunk/engines/saga/sprite.cpp
===================================================================
--- scummvm/trunk/engines/saga/sprite.cpp	2008-01-10 09:45:19 UTC (rev 30368)
+++ scummvm/trunk/engines/saga/sprite.cpp	2008-01-10 10:34:23 UTC (rev 30369)
@@ -177,7 +177,13 @@
 
 void Sprite::getScaledSpriteBuffer(SpriteList &spriteList, int spriteNumber, int scale, int &width, int &height, int &xAlign, int &yAlign, const byte *&buffer) {
 	SpriteInfo *spriteInfo;
-	assert(spriteList.spriteCount>spriteNumber);
+
+	if (spriteList.spriteCount <= spriteNumber) {
+		// this can occur in IHNM while loading a saved game from chapter 1-5 when being in the end chapter
+		warning("spriteList.spriteCount <= spriteNumber");
+		return;
+	}
+
 	spriteInfo = &spriteList.infoList[spriteNumber];
 
 	if (scale < 256) {


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