[Scummvm-cvs-logs] CVS: scummvm/sky rnc_deco.cpp,1.5,1.6

Max Horn fingolfin at users.sourceforge.net
Wed Mar 5 18:51:08 CET 2003


Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv17497

Modified Files:
	rnc_deco.cpp 
Log Message:
a little cleanup, but this should really be turned into a decoder class

Index: rnc_deco.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/rnc_deco.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rnc_deco.cpp	5 Mar 2003 22:21:24 -0000	1.5
+++ rnc_deco.cpp	6 Mar 2003 02:50:50 -0000	1.6
@@ -48,24 +48,14 @@
 uint16 crc_table[0x100];
 #endif
 
-uint32 unpack_len = 0;
-uint32 pack_len = 0;
-uint16 pack_paras = 0;
-uint16 counts = 0;
 uint16 bit_buffl = 0;
 uint16 bit_buffh = 0;
-uint8 blocks = 0;
 uint8 bit_count = 0;
 
-#ifdef CHECKSUMS
-uint16 crc_u = 0;
-uint16 crc_p = 0;
-#endif
-
 
 uint8 *esiptr, *ediptr; //these need to be global because input_bits() uses them
 
-void init_crc(void)
+void init_crc()
 {
 	uint16 cnt=0; 
 	uint16 tmp1=0; 
@@ -199,6 +189,15 @@
 	uint8 *inputHigh, *outputLow, *outputHigh;
 	uint8 *inputptr = (uint8 *)input;
 
+	uint32 unpack_len = 0;
+	uint32 pack_len = 0;
+	uint16 counts = 0;
+
+#ifdef CHECKSUMS
+	uint16 crc_u = 0;
+	uint16 crc_p = 0;
+#endif
+	
 	if (CHECKSUMS)
 		init_crc();
 
@@ -212,7 +211,7 @@
 	unpack_len = READ_BE_UINT32(inputptr); inputptr += 4;
 	pack_len = READ_BE_UINT32(inputptr); inputptr += 4;
 
-	blocks = *(inputptr+5);
+	uint8 blocks = *(inputptr+5);
 
 	if (CHECKSUMS) {
 		//read CRC's





More information about the Scummvm-git-logs mailing list