From 2178d64cbe795ab839ecac3bdbb4d7dd0bf647bd Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Fri, 19 Aug 2011 14:54:34 +0200
Subject: CGE: Endian-swap the contents of block descriptions.

---
 engines/cge/bitmap.cpp | 18 +++++++++---------
 engines/cge/talk.cpp   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engines')

diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp
index df68491bd5..ddab57eec8 100644
--- a/engines/cge/bitmap.cpp
+++ b/engines/cge/bitmap.cpp
@@ -106,16 +106,16 @@ Bitmap::Bitmap(uint16 w, uint16 h, uint8 fill)
 	                                                // + room for wash table
 	assert(v != NULL);
 
-	*(uint16 *) v = kBmpCPY | dsiz;                 // data chunk hader
+	*(uint16 *) v = TO_LE_16(kBmpCPY | dsiz);                 // data chunk hader
 	memset(v + 2, fill, dsiz);                      // data bytes
-	*(uint16 *)(v + lsiz - 2) = kBmpSKP | ((kScrWidth / 4) - dsiz);  // gap
+	*(uint16 *)(v + lsiz - 2) = TO_LE_16(kBmpSKP | ((kScrWidth / 4) - dsiz));  // gap
 
 	// Replicate lines
 	byte *destP;
 	for (destP = v + lsiz; destP < (v + psiz); destP += lsiz)
 		Common::copy(v, v + lsiz, destP);
 
-	*(uint16 *)(v + psiz - 2) = kBmpEOI;            // plane trailer uint16
+	*(uint16 *)(v + psiz - 2) = TO_LE_16(kBmpEOI);            // plane trailer uint16
 
 	// Repliccate planes
 	for (destP = v + psiz; destP < (v + 4 * psiz); destP += psiz)
@@ -239,7 +239,7 @@ BitmapPtr Bitmap::code() {
 					if ((pix == kPixelTransp) != skip || cnt >= 0x3FF0) { // end of block
 						cnt |= (skip) ? kBmpSKP : kBmpCPY;
 						if (_v)
-							*cp = cnt;                          // store block description uint16
+							*cp = TO_LE_16(cnt);                          // store block description uint16
 
 						cp = (uint16 *) im;
 						im += 2;
@@ -261,7 +261,7 @@ BitmapPtr Bitmap::code() {
 					} else {
 						cnt |= kBmpCPY;
 						if (_v)
-							*cp = cnt;
+							*cp = TO_LE_16(cnt);
 
 						cp = (uint16 *) im;
 						im += 2;
@@ -273,13 +273,13 @@ BitmapPtr Bitmap::code() {
 			if (cnt && ! skip) {
 				cnt |= kBmpCPY;
 				if (_v)
-					*cp = cnt;
+					*cp = TO_LE_16(cnt);
 
 				cp = (uint16 *) im;
 				im += 2;
 			}
 			if (_v)
-				*cp = kBmpEOI;
+				*cp = TO_LE_16(kBmpEOI);
 			cp = (uint16 *) im;
 			im += 2;
 		}
@@ -326,7 +326,7 @@ bool Bitmap::solidAt(int16 x, int16 y) {
 	while (r) {
 		uint16 w, t;
 
-		w = *(uint16 *) m;
+		w = READ_LE_UINT16(m);
 		m += 2;
 		t = w & 0xC000;
 		w &= 0x3FFF;
@@ -347,7 +347,7 @@ bool Bitmap::solidAt(int16 x, int16 y) {
 	while (true) {
 		uint16 w, t;
 
-		w = *(uint16 *) m;
+		w = READ_LE_UINT16(m);
 		m += 2;
 		t = w & 0xC000;
 		w &= 0x3FFF;
diff --git a/engines/cge/talk.cpp b/engines/cge/talk.cpp
index db44536267..88949dbfc0 100644
--- a/engines/cge/talk.cpp
+++ b/engines/cge/talk.cpp
@@ -276,7 +276,7 @@ void InfoLine::update(const char *text) {
 		for (pDest = v + lsiz; pDest < (v + psiz); pDest += lsiz) {
 			Common::copy(v, v + lsiz, pDest);
 		}
-		*(uint16 *)(v + psiz - 2) = kBmpEOI;              // plane trailer uint16
+		*(uint16 *)(v + psiz - 2) = TO_LE_16(kBmpEOI);              // plane trailer uint16
 		for (pDest = v + psiz; pDest < (v + 4 * psiz); pDest += psiz) {
 			Common::copy(v, v + psiz, pDest);
 		}
-- 
cgit v1.2.3