From 2abbcd54a457dfabf17c6ef91a4b7f2faa3e81fd Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Mon, 1 Jun 2009 09:09:44 +0000
Subject: Replaced loadShort/saveShort functions with applicable endian macros

svn-id: r41097
---
 engines/cruise/cruise_main.cpp | 8 --------
 engines/cruise/cruise_main.h   | 2 --
 engines/cruise/function.cpp    | 2 +-
 engines/cruise/script.cpp      | 4 ++--
 4 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'engines/cruise')

diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 03ee9a08c3..a5cec48e2d 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -79,14 +79,6 @@ int getNumObjectsByClass(int scriptIdx, int param) {
 	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;
 
diff --git a/engines/cruise/cruise_main.h b/engines/cruise/cruise_main.h
index 479f6366be..1b300bd587 100644
--- a/engines/cruise/cruise_main.h
+++ b/engines/cruise/cruise_main.h
@@ -91,9 +91,7 @@ bool delphineUnpack(byte *dst, const byte *src, int len);
 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);
diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp
index 0f601a582b..6c8608b4fd 100644
--- a/engines/cruise/function.cpp
+++ b/engines/cruise/function.cpp
@@ -112,7 +112,7 @@ int16 Op_Exec(void) {
 	ptr2 = ptr;
 
 	for (i = 0; i < numOfArgToPop; i++) {
-		saveShort(ptr2, popTable[i]);
+		WRITE_BE_UINT16(ptr2, popTable[i]);
 		ptr2 += 2;
 	}
 
diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp
index 29654e15e2..c08c9d267f 100644
--- a/engines/cruise/script.cpp
+++ b/engines/cruise/script.cpp
@@ -95,7 +95,7 @@ int32 opcodeType0(void) {
 
 		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 @@ int32 opcodeType1(void)	{
 
 		switch (type2) {
 		case 1: {
-			saveShort(ptr + var_A + offset * 2, var);
+			WRITE_BE_UINT16(ptr + var_A + offset * 2, var);
 			return 0;
 		}
 		case 2: {
-- 
cgit v1.2.3