[Scummvm-cvs-logs] SF.net SVN: scummvm: [25488] scummvm/trunk/engines/agos/charset.cpp

[kirben at users.sourceforge.net]

Revision: 25488
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25488&view=rev
Author:   kirben
Date:     2007-02-11 03:35:19 -0800 (Sun, 11 Feb 2007)

Log Message:
-----------
Whitespace changes.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/charset.cpp

Modified: scummvm/trunk/engines/agos/charset.cpp
===================================================================
--- scummvm/trunk/engines/agos/charset.cpp	2007-02-11 11:24:37 UTC (rev 25487)
+++ scummvm/trunk/engines/agos/charset.cpp	2007-02-11 11:35:19 UTC (rev 25488)
@@ -294,9 +294,9 @@
 		count *= 2;
 
 	p = dst + vga_sprite_id * 8;
-	dst += READ_BE_UINT32(p);
 	WRITE_BE_UINT16(p + 4, height);
 	WRITE_BE_UINT16(p + 6, width);
+	dst += READ_BE_UINT32(p);
 
 	width /= 8;	// convert width from pixels to bytes
 
@@ -312,8 +312,7 @@
 			delta = 0;
 		} else if ((tmp -= '!') < 0) {
 			delta += 6;
-			if (delta > 8)
-			{
+			if (delta > 8) {
 				delta -= 8;
 				dst_org++;
 			}
@@ -322,22 +321,18 @@
 			int img_width = img[40];
 			int mdelta = 8 - delta;
 			byte *cur_dst = dst_org;
-			for (int row = 0; row < 10; row++)
-			{
+			for (int row = 0; row < 10; row++) {
 				int col = color;
-				for (int plane = 0; plane < 3; plane++)
-				{
+				for (int plane = 0; plane < 3; plane++) {
 					chr = img[plane] >> delta;
-					if (chr)
-					{
+					if (chr) {
 						if (col & 1) *(cur_dst + charsize * 0) |= chr;
 						if (col & 2) *(cur_dst + charsize * 1) |= chr;
 						if (col & 4) *(cur_dst + charsize * 2) |= chr;
 						if (col & 8) *(cur_dst + charsize * 3) |= chr;
 					}
 					chr = img[plane] << mdelta;
-					if ((mdelta >= img_width) && (chr))
-					{
+					if ((mdelta >= img_width) && (chr)) {
 						if (col & 1) *(cur_dst + charsize * 0 + 1) |= chr;
 						if (col & 2) *(cur_dst + charsize * 1 + 1) |= chr;
 						if (col & 4) *(cur_dst + charsize * 2 + 1) |= chr;
@@ -346,16 +341,14 @@
 					col++;
 				}
 				chr = img[3] >> delta;
-				if (chr)
-				{
+				if (chr) {
 					*(cur_dst + charsize * 0) |= chr;
 					*(cur_dst + charsize * 1) |= chr;
 					*(cur_dst + charsize * 2) |= chr;
 					*(cur_dst + charsize * 3) |= chr;
 				}
 				chr = img[3] << mdelta;
-				if ((mdelta >= img_width) && (chr))
-				{
+				if ((mdelta >= img_width) && (chr)) {
 					*(cur_dst + charsize * 0 + 1) |= chr;
 					*(cur_dst + charsize * 1 + 1) |= chr;
 					*(cur_dst + charsize * 2 + 1) |= chr;
@@ -365,8 +358,7 @@
 				img += 4;
 			}
 			delta += img_width - 1;
-			if (delta > 8)
-			{
+			if (delta > 8) {
 				delta -= 8;
 				dst_org++;
 			}


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