[Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec47.cpp,1.43,1.44

Pawel Kolodziejski aquadran at users.sourceforge.net
Wed Mar 12 22:38:02 CET 2003


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

Modified Files:
	codec47.cpp 
Log Message:
clenaup

Index: codec47.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- codec47.cpp	13 Mar 2003 01:24:02 -0000	1.43
+++ codec47.cpp	13 Mar 2003 06:37:07 -0000	1.44
@@ -453,26 +453,26 @@
 
 	if (code < 0xF8) {
 		tmp = _table[code] + _offset1;
-		*(uint16 *)(d_dst + (_d_pitch * 0)) = *(uint16 *)(d_dst + (_d_pitch * 0) + tmp);
-		*(uint16 *)(d_dst + (_d_pitch * 1)) = *(uint16 *)(d_dst + (_d_pitch * 1) + tmp);
+		*(uint16 *)(d_dst) = *(uint16 *)(d_dst + tmp);
+		*(uint16 *)(d_dst + _d_pitch) = *(uint16 *)(d_dst + _d_pitch + tmp);
 	} else if (code == 0xFF) {
-		*(uint16 *)(d_dst + (_d_pitch * 0)) = *(uint16 *)(_d_src + 0);
-		*(uint16 *)(d_dst + (_d_pitch * 1)) = *(uint16 *)(_d_src + 2);
+		*(uint16 *)(d_dst) = *(uint16 *)(_d_src + 0);
+		*(uint16 *)(d_dst + _d_pitch) = *(uint16 *)(_d_src + 2);
 		_d_src += 4;
 	} else if (code == 0xFE) {
 		byte t = *_d_src++;
 		tmp = t | t << 8;
-		*(uint16 *)(d_dst + (_d_pitch * 0)) = (uint16)tmp;
-		*(uint16 *)(d_dst + (_d_pitch * 1)) = (uint16)tmp;
+		*(uint16 *)(d_dst) = (uint16)tmp;
+		*(uint16 *)(d_dst + _d_pitch) = (uint16)tmp;
 	} else if (code == 0xFC) {
 		tmp = _offset2;
-		*(uint16 *)(d_dst + (_d_pitch * 0)) = *(uint16 *)(d_dst + (_d_pitch * 0) + tmp);
-		*(uint16 *)(d_dst + (_d_pitch * 1)) = *(uint16 *)(d_dst + (_d_pitch * 1) + tmp);
+		*(uint16 *)(d_dst) = *(uint16 *)(d_dst + tmp);
+		*(uint16 *)(d_dst + _d_pitch) = *(uint16 *)(d_dst + _d_pitch + tmp);
 	} else {
 		byte t = _paramPtr[code];
 		tmp = t | t << 8;
-		*(uint16 *)(d_dst + (_d_pitch * 0)) = (uint16)tmp;
-		*(uint16 *)(d_dst + (_d_pitch * 1)) = (uint16)tmp;
+		*(uint16 *)(d_dst) = (uint16)tmp;
+		*(uint16 *)(d_dst + _d_pitch) = (uint16)tmp;
 	}
 }
 





More information about the Scummvm-git-logs mailing list