[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.97,1.98

kirben kirben at users.sourceforge.net
Thu Mar 10 19:22:14 CET 2005


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

Modified Files:
	sprite_he.cpp 
Log Message:

Check for negative value


Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- sprite_he.cpp	10 Mar 2005 11:34:41 -0000	1.97
+++ sprite_he.cpp	11 Mar 2005 03:21:43 -0000	1.98
@@ -85,8 +85,7 @@
 			if (spi->field_80) {
 				int16 x1, x2, y1, y2;
 
-				state = getWizImageStates(spi->field_80);
-				state /= spi->cur_img_state;
+				state = spi->cur_img_state / getWizImageStates(spi->field_80);
 
 				x = x_pos - spi->pos.x;
 				y = y_pos - spi->pos.y;
@@ -450,8 +449,8 @@
 
 	if (_spriteTable[spriteId].res_id) {
 		int res_wiz_states = _spriteTable[spriteId].res_wiz_states - 1;
-		if (state > res_wiz_states)
-			state = res_wiz_states;
+		state = MAX(0, state);
+		state = MIN(state, res_wiz_states);
 	
 		if (_spriteTable[spriteId].res_state != state) {
 			_spriteTable[spriteId].res_state = state;





More information about the Scummvm-git-logs mailing list