[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.150,1.151
Gregory Montoir
cyx at users.sourceforge.net
Sat Jul 23 09:12:39 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23947
Modified Files:
sprite_he.cpp
Log Message:
In lost/smaller, spriteGroups bounds set by Sprite::setGroupBounds() aren't always valid rects, add a check for this.
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- sprite_he.cpp 24 Jun 2005 15:23:19 -0000 1.150
+++ sprite_he.cpp 23 Jul 2005 16:11:20 -0000 1.151
@@ -1372,8 +1372,9 @@
spi->curImgFlags = wiz.img.flags;
if (spi->group && (_spriteGroups[spi->group].flags & kSGFClipBox)) {
- if (spi->bbox.intersects(_spriteGroups[spi->group].bbox)) {
- spi->bbox.clip(_spriteGroups[spi->group].bbox);
+ Common::Rect &spgBbox = _spriteGroups[spi->group].bbox;
+ if (spgBbox.isValidRect() && spi->bbox.intersects(spgBbox)) {
+ spi->bbox.clip(spgBbox);
wiz.processFlags |= kWPFClipBox;
wiz.box = spi->bbox;
} else {
More information about the Scummvm-git-logs
mailing list