[Scummvm-cvs-logs] SF.net SVN: scummvm: [30370] scummvm/branches/branch-0-11-0/engines/saga/ sprite.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Jan 10 11:35:25 CET 2008
Revision: 30370
http://scummvm.svn.sourceforge.net/scummvm/?rev=30370&view=rev
Author: thebluegr
Date: 2008-01-10 02:35:25 -0800 (Thu, 10 Jan 2008)
Log Message:
-----------
(backport) Changed an assertion to a warning
Modified Paths:
--------------
scummvm/branches/branch-0-11-0/engines/saga/sprite.cpp
Modified: scummvm/branches/branch-0-11-0/engines/saga/sprite.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/saga/sprite.cpp 2008-01-10 10:34:23 UTC (rev 30369)
+++ scummvm/branches/branch-0-11-0/engines/saga/sprite.cpp 2008-01-10 10:35:25 UTC (rev 30370)
@@ -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.
More information about the Scummvm-git-logs
mailing list