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

[dreammaster at users.sourceforge.net]

Revision: 41097
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41097&view=rev
Author:   dreammaster
Date:     2009-06-01 09:09:44 +0000 (Mon, 01 Jun 2009)

Log Message:
-----------
Replaced loadShort/saveShort functions with applicable endian macros

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/cruise_main.cpp
    scummvm/trunk/engines/cruise/cruise_main.h
    scummvm/trunk/engines/cruise/function.cpp
    scummvm/trunk/engines/cruise/script.cpp

Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp	2009-06-01 08:46:39 UTC (rev 41096)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp	2009-06-01 09:09:44 UTC (rev 41097)
@@ -79,14 +79,6 @@
 	return (counter);
 }
 
-void saveShort(void *ptr, short int var) {
-	WRITE_BE_UINT16(ptr, var);
-}
-
-int16 loadShort(void *ptr) {
-	return (int16)READ_BE_UINT16(ptr);
-}
-
 void resetFileEntryRange(int param1, int param2) {
 	int i;
 

Modified: scummvm/trunk/engines/cruise/cruise_main.h
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.h	2009-06-01 08:46:39 UTC (rev 41096)
+++ scummvm/trunk/engines/cruise/cruise_main.h	2009-06-01 09:09:44 UTC (rev 41097)
@@ -91,9 +91,7 @@
 int findHighColor();
 ovlData3Struct *getOvlData3Entry(int32 scriptNumber, int32 param);
 ovlData3Struct *scriptFunc1Sub2(int32 scriptNumber, int32 param);
-int16 loadShort(void *ptr);
 void resetFileEntry(int32 entryNumber);
-void saveShort(void *ptr, int16 var);
 void *mallocAndZero(int32 size);
 uint8 *mainProc14(uint16 overlay, uint16 idx);
 void printInfoBlackBox(const char *string);

Modified: scummvm/trunk/engines/cruise/function.cpp
===================================================================
--- scummvm/trunk/engines/cruise/function.cpp	2009-06-01 08:46:39 UTC (rev 41096)
+++ scummvm/trunk/engines/cruise/function.cpp	2009-06-01 09:09:44 UTC (rev 41097)
@@ -112,7 +112,7 @@
 	ptr2 = ptr;
 
 	for (i = 0; i < numOfArgToPop; i++) {
-		saveShort(ptr2, popTable[i]);
+		WRITE_BE_UINT16(ptr2, popTable[i]);
 		ptr2 += 2;
 	}
 

Modified: scummvm/trunk/engines/cruise/script.cpp
===================================================================
--- scummvm/trunk/engines/cruise/script.cpp	2009-06-01 08:46:39 UTC (rev 41096)
+++ scummvm/trunk/engines/cruise/script.cpp	2009-06-01 09:09:44 UTC (rev 41097)
@@ -95,7 +95,7 @@
 
 		if (size == 1) {
 			address += index;
-			pushVar(loadShort(address));
+			pushVar((int16)READ_BE_UINT16(address));
 			return (0);
 		} else if (size == 2) {
 			pushVar(*address);
@@ -186,7 +186,7 @@
 
 		switch (type2) {
 		case 1: {
-			saveShort(ptr + var_A + offset * 2, var);
+			WRITE_BE_UINT16(ptr + var_A + offset * 2, var);
 			return 0;
 		}
 		case 2: {


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