[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.54,1.55

kirben kirben at users.sourceforge.net
Thu Feb 24 18:08:51 CET 2005


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

Modified Files:
	sprite_he.cpp 
Log Message:

Correct check


Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- sprite_he.cpp	25 Feb 2005 01:23:36 -0000	1.54
+++ sprite_he.cpp	25 Feb 2005 02:07:22 -0000	1.55
@@ -591,7 +591,7 @@
 void ScummEngine_v90he::spriteAddImageToList(int spriteId, int imageNum, int *spriteIdptr) {
 	int listNum;
 	int *ptr;
-	int origResId;
+	int origResId, origResWizStates;
 
 	// XXX needs review
 	checkRange(_varNumSprites, 1, spriteId, "Invalid sprite %d");
@@ -604,6 +604,7 @@
 	}
 
 	origResId = _spriteTable[spriteId].res_id;
+	origResWizStates = _spriteTable[spriteId].res_wiz_states;
 
 	if (imageNum == 1)
 		_spriteTable[spriteId].res_id = *spriteIdptr;
@@ -637,8 +638,7 @@
 		_spriteTable[spriteId].res_wiz_states = getWizImageStates(_spriteTable[spriteId].res_id);
 		_spriteTable[spriteId].flags |= kSFActive | kSFYFlipped | kSFXFlipped | kSFBlitDirectly;
 
-		if (_spriteTable[spriteId].res_id == origResId &&
-			_spriteTable[spriteId].res_wiz_states == spriteId)
+		if (_spriteTable[spriteId].res_id == origResId && _spriteTable[spriteId].res_wiz_states == origResWizStates)
 			return;
 
 		_spriteTable[spriteId].flags |= kSFChanged | kSFNeedRedraw;





More information about the Scummvm-git-logs mailing list