diff options
author | Benjamin Haisch | 2008-06-12 11:09:04 +0000 |
---|---|---|
committer | Benjamin Haisch | 2008-06-12 11:09:04 +0000 |
commit | fb31c62ad82c26b17ec8f95c33f532eca1deba62 (patch) | |
tree | 065fad466a344b13fabcca363aac043351baed95 /engines/made/database.cpp | |
parent | 555ddf9f9540bd1d62e0b2affbff4b62c284d9d1 (diff) | |
download | scummvm-rg350-fb31c62ad82c26b17ec8f95c33f532eca1deba62.tar.gz scummvm-rg350-fb31c62ad82c26b17ec8f95c33f532eca1deba62.tar.bz2 scummvm-rg350-fb31c62ad82c26b17ec8f95c33f532eca1deba62.zip |
- Added support for Rodney's Fun Screen
- Added audio cd playback (still kinda broken though)
- Renamed getObjectPropertyPtr to findObjectProperty
svn-id: r32669
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..edf608f02a 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, %04) 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(); |