From fb31c62ad82c26b17ec8f95c33f532eca1deba62 Mon Sep 17 00:00:00 2001
From: Benjamin Haisch
Date: Thu, 12 Jun 2008 11:09:04 +0000
Subject: - Added support for Rodney's Fun Screen - Added audio cd playback
 (still kinda broken though) - Renamed getObjectPropertyPtr to
 findObjectProperty

svn-id: r32669
---
 engines/made/database.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'engines/made/database.cpp')

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();
-- 
cgit v1.2.3


From 46681407ab8788461546af1bda99b9c3c7859ffa Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Thu, 12 Jun 2008 18:33:34 +0000
Subject: Fixing compilation

svn-id: r32676
---
 engines/made/database.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/made/database.cpp')

diff --git a/engines/made/database.cpp b/engines/made/database.cpp
index edf608f02a..55e0e90732 100644
--- a/engines/made/database.cpp
+++ b/engines/made/database.cpp
@@ -489,7 +489,7 @@ int16 *GameDatabaseV2::findObjectProperty(int16 objectIndex, int16 propertyId, i
 
 	}
 
-	debug(1, "findObjectProperty(%04X, %04) Property not found", objectIndex, propertyId);
+	debug(1, "findObjectProperty(%04X, %04X) Property not found", objectIndex, propertyId);
 	return NULL;
 
 }
-- 
cgit v1.2.3