diff options
| author | Benjamin Haisch | 2008-04-29 21:51:55 +0000 |
|---|---|---|
| committer | Benjamin Haisch | 2008-04-29 21:51:55 +0000 |
| commit | 5975956f2c5d5561574d5ce8835ad18d300da2bd (patch) | |
| tree | bab532674062ad42d32112c705368c061539de0e /engines/made/database.cpp | |
| parent | 01dcd766afc60d0b185c8c0a6f5498f416b12924 (diff) | |
| download | scummvm-rg350-5975956f2c5d5561574d5ce8835ad18d300da2bd.tar.gz scummvm-rg350-5975956f2c5d5561574d5ce8835ad18d300da2bd.tar.bz2 scummvm-rg350-5975956f2c5d5561574d5ce8835ad18d300da2bd.zip | |
Fixed possible endian problems in getObjectPropertyPtr.
svn-id: r31779
Diffstat (limited to 'engines/made/database.cpp')
| -rw-r--r-- | engines/made/database.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/made/database.cpp b/engines/made/database.cpp index 816df58510..7c6afda197 100644 --- a/engines/made/database.cpp +++ b/engines/made/database.cpp @@ -280,11 +280,9 @@ int16 *GameDatabase::getObjectPropertyPtr(int16 objectIndex, int16 propertyId, i 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 @@ int16 *GameDatabase::getObjectPropertyPtr(int16 objectIndex, int16 propertyId, i 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 @@ int16 *GameDatabase::getObjectPropertyPtr(int16 objectIndex, int16 propertyId, i } } 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; } |