[Scummvm-cvs-logs] SF.net SVN: scummvm: [29829] scummvm/trunk/engines/cruise

[thebluegr at users.sourceforge.net]

Revision: 29829
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29829&view=rev
Author:   thebluegr
Date:     2007-12-11 15:06:12 -0800 (Tue, 11 Dec 2007)

Log Message:
-----------
Changed some swaps to use the template SWAP

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/font.cpp
    scummvm/trunk/engines/cruise/mainDraw.cpp

Modified: scummvm/trunk/engines/cruise/font.cpp
===================================================================
--- scummvm/trunk/engines/cruise/font.cpp	2007-12-11 22:40:39 UTC (rev 29828)
+++ scummvm/trunk/engines/cruise/font.cpp	2007-12-11 23:06:12 UTC (rev 29829)
@@ -24,6 +24,7 @@
  */
 
 #include "common/file.h"
+#include "common/util.h"
 
 #include "cruise/cruise_main.h"
 
@@ -194,44 +195,26 @@
 
 void flipShort(int16 *var) {
 	uint8 *varPtr = (uint8 *) var;
-	uint8 temp = varPtr[0];
-	varPtr[0] = varPtr[1];
-	varPtr[1] = temp;
+	SWAP(varPtr[0], varPtr[1]);
 }
 
 void flipShort(uint16 *var) {
 	uint8 *varPtr = (uint8 *) var;
-	uint8 temp = varPtr[0];
-	varPtr[0] = varPtr[1];
-	varPtr[1] = temp;
+	SWAP(varPtr[0], varPtr[1]);
 }
 
 void flipLong(int32 *var) {
-	char swap1;
-	char swap2;
 	char *varPtr = (char *)var;
 
-	swap1 = varPtr[0];
-	varPtr[0] = varPtr[3];
-	varPtr[3] = swap1;
-
-	swap2 = varPtr[1];
-	varPtr[1] = varPtr[2];
-	varPtr[2] = swap2;
+	SWAP(varPtr[0], varPtr[3]);
+	SWAP(varPtr[1], varPtr[2]);
 }
 
 void flipLong(uint32 *var) {
-	char swap1;
-	char swap2;
 	char *varPtr = (char *)var;
 
-	swap1 = varPtr[0];
-	varPtr[0] = varPtr[3];
-	varPtr[3] = swap1;
-
-	swap2 = varPtr[1];
-	varPtr[1] = varPtr[2];
-	varPtr[2] = swap2;
+	SWAP(varPtr[0], varPtr[3]);
+	SWAP(varPtr[1], varPtr[2]);
 }
 
 void flipGen(void *var, int32 length) {

Modified: scummvm/trunk/engines/cruise/mainDraw.cpp
===================================================================
--- scummvm/trunk/engines/cruise/mainDraw.cpp	2007-12-11 22:40:39 UTC (rev 29828)
+++ scummvm/trunk/engines/cruise/mainDraw.cpp	2007-12-11 23:06:12 UTC (rev 29829)
@@ -82,12 +82,8 @@
 }
 
 void flipScreen(void) {
-	uint8 *swapPtr;
+	SWAP(gfxModuleData.pPage00, gfxModuleData.pPage10);
 
-	swapPtr = gfxModuleData.pPage00;
-	gfxModuleData.pPage00 = gfxModuleData.pPage10;
-	gfxModuleData.pPage10 = swapPtr;
-
 	gfxModuleData_flipScreen();
 
 	/*memcpy(globalAtariScreen, gfxModuleData.pPage00, 16000);


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