From 947608cd91ed379e3b490784ee34e268adcd0698 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Thu, 10 Jan 2008 10:34:23 +0000 Subject: Changed an assertion to a warning svn-id: r30369 --- engines/saga/sprite.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp index 1efe327b80..34b54e30f9 100644 --- a/engines/saga/sprite.cpp +++ b/engines/saga/sprite.cpp @@ -177,7 +177,13 @@ void Sprite::loadList(int resourceId, SpriteList &spriteList) { 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) { -- cgit v1.2.3