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

Pawel Kolodziejski aquadran at users.sourceforge.net
Sat Dec 6 00:15:01 CET 2003


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

Modified Files:
	codec47.cpp 
Log Message:
cleanup

Index: codec47.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- codec47.cpp	16 Nov 2003 20:52:57 -0000	1.63
+++ codec47.cpp	6 Dec 2003 08:14:30 -0000	1.64
@@ -384,7 +384,6 @@
 			d_dst += _d_pitch;
 		}
 	} else if (code == 0xFF) {
-		byte *tmp_dst = d_dst;
 		level3(d_dst);
 		d_dst += 2;
 		level3(d_dst);
@@ -392,7 +391,6 @@
 		level3(d_dst);
 		d_dst += 2;
 		level3(d_dst);
-		d_dst = tmp_dst;
 	} else if (code == 0xFE) {
 		byte t = *_d_src++;
 		for (i = 0; i < 4; i++) {
@@ -400,7 +398,7 @@
 			d_dst += _d_pitch;
 		}
 	} else if (code == 0xFD) {
-		byte *tmp_ptr = _tableSmall + (*_d_src++ << 7);
+		byte *tmp_ptr = _tableSmall + *_d_src++ * 128;
 		int32 l = tmp_ptr[96];
 		byte val = *_d_src++;
 		int16 *tmp_ptr2 = (int16 *)tmp_ptr;
@@ -443,7 +441,6 @@
 			d_dst += _d_pitch;
 		}
 	} else if (code == 0xFF) {
-		byte *tmp_dst = d_dst;
 		level2(d_dst);
 		d_dst += 4;
 		level2(d_dst);
@@ -451,7 +448,6 @@
 		level2(d_dst);
 		d_dst += 4;
 		level2(d_dst);
-		d_dst = tmp_dst;
 	} else if (code == 0xFE) {
 		byte t = *_d_src++;
 		for (i = 0; i < 8; i++) {
@@ -461,7 +457,7 @@
 		}
 	} else if (code == 0xFD) {
 		tmp = *_d_src++;
-		byte *tmp_ptr = _tableBig + (tmp << 2) + (tmp << 7) + (tmp << 8);
+		byte *tmp_ptr = _tableBig + tmp * 388;
 		byte l = tmp_ptr[384];
 		byte val = *_d_src++;
 		int16 *tmp_ptr2 = (int16 *)tmp_ptr;





More information about the Scummvm-git-logs mailing list