[Scummvm-cvs-logs] SF.net SVN: scummvm:[39319] scummvm/trunk/engines/sci/scicore

[lordhoto at users.sourceforge.net]

Revision: 39319
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39319&view=rev
Author:   lordhoto
Date:     2009-03-10 22:18:16 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
Formatting.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/scicore/decompressor.cpp
    scummvm/trunk/engines/sci/scicore/decompressor.h

Modified: scummvm/trunk/engines/sci/scicore/decompressor.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/decompressor.cpp	2009-03-10 22:11:11 UTC (rev 39318)
+++ scummvm/trunk/engines/sci/scicore/decompressor.cpp	2009-03-10 22:18:16 UTC (rev 39319)
@@ -47,7 +47,7 @@
 	return _src->ioFailed() || _dest->ioFailed() ? 1 : 0;
 }
 
-void Decompressor::init(Common::ReadStream*src, Common::WriteStream*dest, uint32 nPacked,
+void Decompressor::init(Common::ReadStream *src, Common::WriteStream *dest, uint32 nPacked,
 		uint32 nUnpacked) {
 	_src = src;
 	_dest = dest;
@@ -132,7 +132,7 @@
 //-------------------------------
 // LZW-like Decompressor
 //-------------------------------
-void DecompressorComp3::init(Common::ReadStream*src, Common::WriteStream*dest, uint32 nPacked, uint32 nUnpacked) {
+void DecompressorComp3::init(Common::ReadStream *src, Common::WriteStream *dest, uint32 nPacked, uint32 nUnpacked) {
 	Decompressor::init(src, dest, nPacked, nUnpacked);
 	
 	_lastchar = _lastbits = _stakptr = 0;
@@ -323,7 +323,7 @@
 		pos ++;
 		size ++;
 		
-		switch (nextbyte&0xC0) {
+		switch (nextbyte & 0xC0) {
 		case 0x40 :
 		case 0x00 :
 			pos += nextbyte;
@@ -331,7 +331,7 @@
 		case 0xC0 :
 			break;
 		case 0x80 :
-			pos ++;
+			pos++;
 			break;
 		}
 	}
@@ -351,11 +351,11 @@
 	
 	writer = outbuffer;
 
-	*(writer++) = PIC_OP_OPX;
-	*(writer++) = PIC_OPX_SET_PALETTE;
+	*writer++ = PIC_OP_OPX;
+	*writer++ = PIC_OPX_SET_PALETTE;
 
 	for (i = 0; i < 256; i++) /* Palette translation map */
-		*(writer++) = i;
+		*writer++ = i;
 
 	WRITE_LE_UINT16(writer, 0); /* Palette stamp */
 	writer += 2;
@@ -393,18 +393,18 @@
 	seeker += cdata_size;
 	
 	writer = outbuffer + view_start;
-	*(writer++) = PIC_OP_OPX;
-	*(writer++) = PIC_OPX_EMBEDDED_VIEW;
-	*(writer++) = 0;
-	*(writer++) = 0;
-	*(writer++) = 0;
+	*writer++ = PIC_OP_OPX;
+	*writer++ = PIC_OPX_EMBEDDED_VIEW;
+	*writer++ = 0;
+	*writer++ = 0;
+	*writer++ = 0;
 	WRITE_LE_UINT16(writer, view_size + 8);
 	writer += 2;
 
 	memcpy(writer, viewdata, sizeof(viewdata));
 	writer += sizeof(viewdata);
 
-	*(writer++) = 0;
+	*writer++ = 0;
 	
 	decode_rle(&seeker, &cdata, writer, view_size);
 	
@@ -465,8 +465,8 @@
 	for (c = 0; c < cel_total; c++)
 		cc_lengths[c] = READ_LE_UINT16(cellengths+2*c);
 	
-	*(writer++) = loopheaders;
-	*(writer++) = VIEW_HEADER_COLORS_8BIT;
+	*writer++ = loopheaders;
+	*writer++ = VIEW_HEADER_COLORS_8BIT;
 	WRITE_LE_UINT16(writer, lh_mask);
 	writer += 2;
 	WRITE_LE_UINT16(writer, unknown);
@@ -537,12 +537,12 @@
 	for (c = 0; c < cel_total; c++)
 		decode_rle(&rle_ptr, &pix_ptr, cc_pos[c]+8, cc_lengths[c]);
 
-	*(writer++) = 'P';
-	*(writer++) = 'A';
-	*(writer++) = 'L';
+	*writer++ = 'P';
+	*writer++ = 'A';
+	*writer++ = 'L';
 	
 	for (c = 0; c < 256; c++)
-		*(writer++) = c;
+		*writer++ = c;
 
 	seeker -= 4; /* The missing four. Don't ask why. */
 	memcpy(writer, seeker, 4*256+4);

Modified: scummvm/trunk/engines/sci/scicore/decompressor.h
===================================================================
--- scummvm/trunk/engines/sci/scicore/decompressor.h	2009-03-10 22:11:11 UTC (rev 39318)
+++ scummvm/trunk/engines/sci/scicore/decompressor.h	2009-03-10 22:18:16 UTC (rev 39319)
@@ -133,7 +133,7 @@
 	struct tokenlist {
 		byte data;
 		uint16 next;
-		} _tokens[0x1004];
+	} _tokens[0x1004];
 	byte _stak[0x1014];
 	byte _lastchar;
 	uint16 _stakptr;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.