diff options
| author | Christopher Page | 2008-06-20 19:42:29 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-06-20 19:42:29 +0000 |
| commit | 65abece4c67c4fb574caac717fff24bfb5f31d69 (patch) | |
| tree | d5667167747cfbf45b7ffd38d05e6c81182ff1bc /engines/made/database.cpp | |
| parent | 6dce28e166865dd8c892e0e298ed6abcdc1042bd (diff) | |
| parent | 0c6c7de3554a65a22324a0aa89b111aa7f2fa79f (diff) | |
| download | scummvm-rg350-65abece4c67c4fb574caac717fff24bfb5f31d69.tar.gz scummvm-rg350-65abece4c67c4fb574caac717fff24bfb5f31d69.tar.bz2 scummvm-rg350-65abece4c67c4fb574caac717fff24bfb5f31d69.zip | |
Merged revisions 32727-32728,32730-32733,32737-32738 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r32740
Diffstat (limited to 'engines/made/database.cpp')
| -rw-r--r-- | engines/made/database.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/engines/made/database.cpp b/engines/made/database.cpp index 55e0e90732..3497b5b46f 100644 --- a/engines/made/database.cpp +++ b/engines/made/database.cpp @@ -88,10 +88,7 @@ int16 Object::getVectorItem(int16 index) { if (getClass() == 0x7FFF) { byte *vector = (byte*)getData(); return vector[index]; - } else if (getClass() == 0x7FFE) { - int16 *vector = (int16*)getData(); - return READ_LE_UINT16(&vector[index]); - } else if (getClass() < 0x7FFE) { + } else if (getClass() <= 0x7FFE) { int16 *vector = (int16*)getData(); return READ_LE_UINT16(&vector[index]); } else { @@ -372,7 +369,7 @@ void GameDatabaseV2::load(Common::SeekableReadStream &sourceS) { debug(2, "textOffs = %08X; textSize = %08X; objectCount = %d; varObjectCount = %d; gameStateSize = %d; objectsOffs = %08X; objectsSize = %d\n", textOffs, textSize, objectCount, varObjectCount, _gameStateSize, objectsOffs, objectsSize); _gameState = new byte[_gameStateSize + 2]; - memset(_gameState, 0, _gameStateSize); + memset(_gameState, 0, _gameStateSize + 2); setVar(1, objectCount); sourceS.seek(textOffs); @@ -441,7 +438,7 @@ int16 *GameDatabaseV2::findObjectProperty(int16 objectIndex, int16 propertyId, i int16 *propPtr2 = prop + count2; // First see if the property exists in the given object - while (count2-- > 0) { + while (count2--) { if ((READ_LE_UINT16(prop) & 0x7FFF) == propertyId) { propertyFlag = obj->getFlags() & 1; return propPtr1; @@ -467,8 +464,8 @@ int16 *GameDatabaseV2::findObjectProperty(int16 objectIndex, int16 propertyId, i propPtr1 = propPtr2 + count1 - count2; int16 *propertyPtr = prop + count1; - while (count2-- > 0) { - if (!(READ_LE_UINT16(prop) & 0x8000)) { + while (count2--) { + if ((READ_LE_UINT16(prop) & 0x8000) == 0) { if ((READ_LE_UINT16(prop) & 0x7FFF) == propertyId) { propertyFlag = obj->getFlags() & 1; return propPtr1; |