[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.60,1.61 wiz_he.cpp,2.6,2.7

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7711/scumm

Modified Files:
	sprite_he.cpp wiz_he.cpp 
Log Message:

Fix sprite hacks


Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- sprite_he.cpp	25 Feb 2005 23:37:25 -0000	1.60
+++ sprite_he.cpp	26 Feb 2005 00:35:23 -0000	1.61
@@ -41,7 +41,7 @@
 //
 int ScummEngine_v90he::findSpriteWithClassOf(int x, int y, int spriteGroup, int d, int num, int *args) {
 	int classId;
-	debug(1, "findSprite: x %d, y %d, spriteGroup %d, d %d, num %d\n", x, y, spriteGroup, d, num);
+	debug(1, "findSprite: x %d, y %d, spriteGroup %d, d %d, num %d", x, y, spriteGroup, d, num);
 
 	for (int i = 0; i < _numSpritesToProcess; ++i) {
 		SpriteInfo *spi = _activeSpritesTable[i];
@@ -676,7 +676,8 @@
 	_spriteTable[spriteId].field_14 = 0;
 	_spriteTable[spriteId].field_7C = 0;
 	_spriteTable[spriteId].field_80 = 0;
-	_spriteTable[spriteId].field_18 = 0; // Maybe HE99+?
+	// freddicove specific
+	//_spriteTable[spriteId].field_18 = 0;
 	_spriteTable[spriteId].field_88 = 0;
 }
 
@@ -1256,11 +1257,11 @@
 		spr_flags = spi->flags;
 
 		if (arg) {
-			if (spi->field_0)
-				; //return; // HACK
+			if (spi->field_0 >= 0)
+				return;
 		} else {
 			if (spi->field_0 < 0)
-				; //continue; // HACK
+				continue;
 		}
 		
 		spi->flags &= ~(kSFChanged | kSFNeedRedraw);

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -d -r2.6 -r2.7
--- wiz_he.cpp	25 Feb 2005 11:45:25 -0000	2.6
+++ wiz_he.cpp	26 Feb 2005 00:35:23 -0000	2.7
@@ -1121,12 +1121,7 @@
 
 void ScummEngine_v80he::loadImgSpot(int resId, int state, int16 &x, int16 &y) {
 	const uint8 *dataPtr = getResourceAddress(rtImage, resId);
-	if (!dataPtr) {
-		warning("loadImgSpot: unknown Image %d", resId);
-		x = y = 0;
-		return;
-	}
-
+	assert(dataPtr);
 	const uint8 *spotPtr = findWrappedBlock(MKID('SPOT'), dataPtr, state, 0);
 	if (spotPtr) {
 		x = (int16)READ_LE_UINT32(spotPtr + 0);