[Scummvm-cvs-logs] CVS: scummvm/sword1 screen.cpp,1.9,1.10

Robert G?ffringmann lavosspawn at users.sourceforge.net
Wed Dec 17 17:01:06 CET 2003


Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv29777/sword1

Modified Files:
	screen.cpp 
Log Message:
big endian typecasts for FROM_LE_xx

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- screen.cpp	18 Dec 2003 00:36:42 -0000	1.9
+++ screen.cpp	18 Dec 2003 01:00:42 -0000	1.10
@@ -327,12 +327,12 @@
 	uint16 spriteY = compact->o_anim_y;
 	if (compact->o_status & STAT_SHRINK) {
 		scale = (compact->o_scale_a * compact->o_ycoord + compact->o_scale_b) / 256;
-		spriteX += (FROM_LE_16(frameHead->offsetX) * scale) / 256;
-		spriteY += (FROM_LE_16(frameHead->offsetY) * scale) / 256;
+		spriteX += ((int16)FROM_LE_16(frameHead->offsetX) * scale) / 256;
+		spriteY += ((int16)FROM_LE_16(frameHead->offsetY) * scale) / 256;
 	} else {
 		scale = 256;
-		spriteX += FROM_LE_16(frameHead->offsetX);
-		spriteY += FROM_LE_16(frameHead->offsetY);
+		spriteX += (int16)FROM_LE_16(frameHead->offsetX);
+		spriteY += (int16)FROM_LE_16(frameHead->offsetY);
 	}
 	if (scale > 512)
 		debug(1, "compact %d is oversized: scale = %d", id, scale);





More information about the Scummvm-git-logs mailing list