[Scummvm-cvs-logs] SF.net SVN: scummvm: [31779] scummvm/trunk/engines/made/database.cpp

[john_doe at users.sourceforge.net]

Revision: 31779
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31779&view=rev
Author:   john_doe
Date:     2008-04-29 14:51:55 -0700 (Tue, 29 Apr 2008)

Log Message:
-----------
Fixed possible endian problems in getObjectPropertyPtr.

Modified Paths:
--------------
    scummvm/trunk/engines/made/database.cpp

Modified: scummvm/trunk/engines/made/database.cpp
===================================================================
--- scummvm/trunk/engines/made/database.cpp	2008-04-29 21:27:16 UTC (rev 31778)
+++ scummvm/trunk/engines/made/database.cpp	2008-04-29 21:51:55 UTC (rev 31779)
@@ -280,11 +280,9 @@
 	while (count2-- > 0) {
 		if ((READ_LE_UINT16(prop) & 0x3FFF) == propertyId) {
 			if (READ_LE_UINT16(prop) & 0x4000) {
-				//debug(2, "! L1.1\n");
 				propertyFlag = 1;
 				return (int16*)_gameState + READ_LE_UINT16(propPtr1);
 			} else {
-				//debug(2, "! L1.2\n");
 				propertyFlag = obj->getFlags() & 1;
 				return propPtr1;
 			}
@@ -316,12 +314,10 @@
 		while (count2-- > 0) {
 			if (!(READ_LE_UINT16(prop) & 0x8000)) {
 				if ((READ_LE_UINT16(prop) & 0x3FFF) == propertyId) {
-					if (*prop & 0x4000) {
-						//debug(2, "! L2.1\n");
+					if (READ_LE_UINT16(prop) & 0x4000) {
 						propertyFlag = 1;
 						return (int16*)_gameState + READ_LE_UINT16(propPtr1);
 					} else {
-						//debug(2, "! L2.2\n");
 						propertyFlag = obj->getFlags() & 1;
 						return propPtr1;
 					}
@@ -330,12 +326,10 @@
 				}
 			} else {
 				if ((READ_LE_UINT16(prop) & 0x3FFF) == propertyId) {
-					if (*prop & 0x4000) {
-						//debug(2, "! L3.1\n");
+					if (READ_LE_UINT16(prop) & 0x4000) {
 						propertyFlag = 1;
 						return (int16*)_gameState + READ_LE_UINT16(propertyPtr);
 					} else {
-						//debug(2, "! L3.2\n");
 						propertyFlag = obj->getFlags() & 1;
 						return propertyPtr;
 					}


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