From 190bd60505e2ca0fb3c99f995d7b618915c895ad Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Wed, 26 Jan 2011 16:51:18 +0000
Subject: SCI: Make SCI3 propertyId endianness hack a bit cleaner

svn-id: r55542
---
 engines/sci/engine/object.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/engine/object.cpp b/engines/sci/engine/object.cpp
index 505cab9e96..bc79e30129 100644
--- a/engines/sci/engine/object.cpp
+++ b/engines/sci/engine/object.cpp
@@ -244,11 +244,15 @@ void Object::initSelectorsSci3(const byte *buf) {
 			for (int bit = 2; bit < 32; ++bit) {
 				int value = READ_SCI11ENDIAN_UINT16(seeker + bit * 2);
 				if (typeMask & (1 << bit)) { // Property
-// We really shouldn't be doing endianness conversion here;
-// instead, propertyIds should be converted to a Common::Array, like _baseMethod already is
-// This interim solution fixes playing SCI3 PC games on Big Endian platforms
-// but would likely fail with Mac versions of the same games...
-					propertyIds[propertyCounter] = TO_LE_16(groupBaseId + bit);
+
+					// FIXME: We really shouldn't be doing endianness
+					// conversion here; instead, propertyIds should be converted
+					// to a Common::Array, like _baseMethod already is
+					// This interim solution fixes playing SCI3 PC games
+					// on Big Endian platforms
+
+					WRITE_SCI11ENDIAN_UINT16(&propertyIds[propertyCounter],
+					                         groupBaseId + bit);
 					_variables[propertyCounter] = make_reg(0, value);
 					propertyOffsets[propertyCounter] = (seeker + bit * 2) - buf;
 					++propertyCounter;
-- 
cgit v1.2.3