[Scummvm-cvs-logs] CVS: scummvm/scumm sprite_he.cpp,1.125,1.126

Marcus Comstedt marcus_c at users.sourceforge.net
Mon Apr 11 13:34:55 CEST 2005


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

Modified Files:
	sprite_he.cpp 
Log Message:
MIN() on two different datatypes not allowed...

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- sprite_he.cpp	11 Apr 2005 07:40:14 -0000	1.125
+++ sprite_he.cpp	11 Apr 2005 20:34:21 -0000	1.126
@@ -757,7 +757,7 @@
 		break;
 	case 0x7E:
 		delay = MAX(0, value);
-		delay = MIN(value, _spriteTable[spriteId].delayAmount);
+		delay = MIN((int32)value, _spriteTable[spriteId].delayAmount);
 
 		_spriteTable[spriteId].delayCount = value;
 		break;





More information about the Scummvm-git-logs mailing list