[Scummvm-cvs-logs] SF.net SVN: scummvm:[55542] scummvm/trunk/engines/sci/engine/object.cpp

[wjpalenstijn at users.sourceforge.net]

Revision: 55542
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55542&view=rev
Author:   wjpalenstijn
Date:     2011-01-26 16:51:18 +0000 (Wed, 26 Jan 2011)

Log Message:
-----------
SCI: Make SCI3 propertyId endianness hack a bit cleaner

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/object.cpp

Modified: scummvm/trunk/engines/sci/engine/object.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/object.cpp	2011-01-26 10:43:38 UTC (rev 55541)
+++ scummvm/trunk/engines/sci/engine/object.cpp	2011-01-26 16:51:18 UTC (rev 55542)
@@ -244,11 +244,15 @@
 			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;


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