diff options
| author | Christopher Page | 2008-06-16 19:06:48 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-06-16 19:06:48 +0000 |
| commit | 37a7a572cff7c3648f23fab42d45e98c21942d20 (patch) | |
| tree | 84ae8cd418276d6531ba9a0ad19c8e5286105c84 /engines/made/database.cpp | |
| parent | 7009aae8930835221677e71f085841abf66c0151 (diff) | |
| parent | bc01acd18f6a0fae36497826d3a21baf3fec958d (diff) | |
| download | scummvm-rg350-37a7a572cff7c3648f23fab42d45e98c21942d20.tar.gz scummvm-rg350-37a7a572cff7c3648f23fab42d45e98c21942d20.tar.bz2 scummvm-rg350-37a7a572cff7c3648f23fab42d45e98c21942d20.zip | |
Merged revisions 32668-32669,32676,32687-32689,32693,32695,32698-32701,32705 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r32720
Diffstat (limited to 'engines/made/database.cpp')
| -rw-r--r-- | engines/made/database.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/made/database.cpp b/engines/made/database.cpp index 4616b63252..55e0e90732 100644 --- a/engines/made/database.cpp +++ b/engines/made/database.cpp @@ -301,7 +301,7 @@ int16 GameDatabase::getObjectProperty(int16 objectIndex, int16 propertyId) { return 0; int16 propertyFlag; - int16 *property = getObjectPropertyPtr(objectIndex, propertyId, propertyFlag); + int16 *property = findObjectProperty(objectIndex, propertyId, propertyFlag); if (property) { return (int16)READ_LE_UINT16(property); @@ -317,7 +317,7 @@ int16 GameDatabase::setObjectProperty(int16 objectIndex, int16 propertyId, int16 return 0; int16 propertyFlag; - int16 *property = getObjectPropertyPtr(objectIndex, propertyId, propertyFlag); + int16 *property = findObjectProperty(objectIndex, propertyId, propertyFlag); if (property) { if (propertyFlag == 1) { @@ -430,7 +430,7 @@ int16 GameDatabaseV2::loadgame(const char *filename, int16 version) { return result; } -int16 *GameDatabaseV2::getObjectPropertyPtr(int16 objectIndex, int16 propertyId, int16 &propertyFlag) { +int16 *GameDatabaseV2::findObjectProperty(int16 objectIndex, int16 propertyId, int16 &propertyFlag) { Object *obj = getObject(objectIndex); int16 *prop = (int16*)obj->getData(); @@ -489,6 +489,7 @@ int16 *GameDatabaseV2::getObjectPropertyPtr(int16 objectIndex, int16 propertyId, } + debug(1, "findObjectProperty(%04X, %04X) Property not found", objectIndex, propertyId); return NULL; } @@ -597,7 +598,7 @@ int16 GameDatabaseV3::loadgame(const char *filename, int16 version) { return result; } -int16 *GameDatabaseV3::getObjectPropertyPtr(int16 objectIndex, int16 propertyId, int16 &propertyFlag) { +int16 *GameDatabaseV3::findObjectProperty(int16 objectIndex, int16 propertyId, int16 &propertyFlag) { Object *obj = getObject(objectIndex); int16 *prop = (int16*)obj->getData(); |