[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.89,1.90 sprite_he.h,1.20,1.21
kirben
kirben at users.sourceforge.net
Mon Mar 7 03:35:27 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2449/scumm
Modified Files:
sprite_he.cpp sprite_he.h
Log Message:
FindSprite should report the spriteId.
Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- sprite_he.cpp 6 Mar 2005 04:49:58 -0000 1.89
+++ sprite_he.cpp 7 Mar 2005 11:34:23 -0000 1.90
@@ -76,7 +76,7 @@
continue;
if (spi->bbox.bottom < y)
continue;
- return i;
+ return spi->id;
} else {
int resId, state, rot_angle, zoom;
int32 w, h;
@@ -134,7 +134,7 @@
}
if(isWizPixelNonTransparent(rtImage, resId, state, x, y, spi->imgFlags))
- return i;
+ return spi->id;
}
}
@@ -1184,6 +1184,7 @@
else
groupZorder = 0;
+ spi->id = i;
spi->zorder = spi->field_18 + groupZorder;
_activeSpritesTable[_numSpritesToProcess++] = spi;
Index: sprite_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- sprite_he.h 6 Mar 2005 04:31:02 -0000 1.20
+++ sprite_he.h 7 Mar 2005 11:34:23 -0000 1.21
@@ -66,6 +66,7 @@
};
struct SpriteInfo {
+ int id;
int zorder;
int flags;
int res_id;
More information about the Scummvm-git-logs
mailing list