"object" and "objectLastCreated" attribute for actuators, deprecates getObject/setObject() & getLastCreatedObject()

also removed some warnings

1 files changed, 35 insertions, 1 deletions

diff --git a/source/gameengine/Ketsji/KX_ParentActuator.cpp b/source/gameengine/Ketsji/KX_ParentActuator.cpp
index 89549ca6b57..c7ac52e571a 100644
--- a/source/gameengine/Ketsji/KX_ParentActuator.cpp
+++ b/source/gameengine/Ketsji/KX_ParentActuator.cpp
@@ -166,15 +166,44 @@ PyParentObject KX_ParentActuator::Parents[] = {
 };
 
 PyMethodDef KX_ParentActuator::Methods[] = {
+	// ---> deprecated (all)
 	{"setObject",         (PyCFunction) KX_ParentActuator::sPySetObject, METH_O, (PY_METHODCHAR)SetObject_doc},
 	{"getObject",         (PyCFunction) KX_ParentActuator::sPyGetObject, METH_VARARGS, (PY_METHODCHAR)GetObject_doc},
 	{NULL,NULL} //Sentinel
 };
 
-PyObject* KX_ParentActuator::_getattr(const STR_String& attr) {
+PyObject* KX_ParentActuator::_getattr(const STR_String& attr) {	
+	
+	if (attr == "object") {
+		if (!m_ob)	Py_RETURN_NONE;
+		else		return m_ob->AddRef();
+	}
+	
 	_getattr_up(SCA_IActuator);
 }
 
+int KX_ParentActuator::_setattr(const STR_String& attr, PyObject* value) {
+	
+	if (attr == "object") {
+		KX_GameObject *gameobj;
+		
+		if (!ConvertPythonToGameObject(value, &gameobj, true))
+			return 1; // ConvertPythonToGameObject sets the error
+		
+		if (m_ob != NULL)
+			m_ob->UnregisterActuator(this);	
+
+		m_ob = (SCA_IObject*)gameobj;
+		
+		if (m_ob)
+			m_ob->RegisterActuator(this);
+		
+		return 0;
+	}
+	
+	return SCA_IActuator::_setattr(attr, value);
+}
+
 /* 1. setObject                                                            */
 const char KX_ParentActuator::SetObject_doc[] = 
 "setObject(object)\n"
@@ -183,6 +212,8 @@ const char KX_ParentActuator::SetObject_doc[] =
 PyObject* KX_ParentActuator::PySetObject(PyObject* self, PyObject* value) {
 	KX_GameObject *gameobj;
 	
+	ShowDeprecationWarning("setObject()", "the object property");
+	
 	if (!ConvertPythonToGameObject(value, &gameobj, true))
 		return NULL; // ConvertPythonToGameObject sets the error
 	
@@ -206,6 +237,9 @@ const char KX_ParentActuator::GetObject_doc[] =
 PyObject* KX_ParentActuator::PyGetObject(PyObject* self, PyObject* args)
 {
 	int ret_name_only = 1;
+	
+	ShowDeprecationWarning("getObject()", "the object property");
+	
 	if (!PyArg_ParseTuple(args, "|i", &ret_name_only))
 		return NULL;