[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.17,1.18

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv3692/smush

Modified Files:
	smush_player.cpp 
Log Message:
swapped talkPosX and talkPosY (they were misnamed); factored out some duplicate code in string.cpp; VC warning fix in smush_player.cpp

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- smush_player.cpp	10 May 2003 21:49:59 -0000	1.17
+++ smush_player.cpp	12 May 2003 22:08:39 -0000	1.18
@@ -615,8 +615,7 @@
 }
 
 static byte delta_color(byte org_color, int16 delta_color) {
-	int16 t;
-	t = (((int32)(org_color) << 7) + org_color + delta_color) >> 7;
+	int t = ((org_color << 7) + org_color + delta_color) >> 7;
 	if (t > 255)
 		t = 255;
 	if (t < 0)