1 files changed, 18 insertions, 48 deletions

diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
index 3cd750ff63b..2dc80f54568 100644
--- a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
+++ b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
@@ -71,13 +71,6 @@ void SCA_ILogicBrick::SetUeberExecutePriority(int execute_Priority)
 
 
 
-SCA_IObject* SCA_ILogicBrick::GetParent()
-{
-	return m_gameobj;
-}
-
-
-
 void SCA_ILogicBrick::ReParent(SCA_IObject* parent)
 {
 	m_gameobj = parent;
@@ -130,33 +123,17 @@ double SCA_ILogicBrick::GetNumber()
 
 
 
-STR_String SCA_ILogicBrick::GetName()
+STR_String& SCA_ILogicBrick::GetName()
 {
 	return m_name;
 }
 
 
 
-void SCA_ILogicBrick::SetName(STR_String name)
-{
-	m_name = name;
-}
-
-
-
-void SCA_ILogicBrick::ReplicaSetName(STR_String name)
+void SCA_ILogicBrick::SetName(const char *name)
 {
 	m_name = name;
 }
-		
-
-
-bool SCA_ILogicBrick::IsActive()
-{
-	return m_bActive;
-}
-
-
 
 bool SCA_ILogicBrick::LessComparedTo(SCA_ILogicBrick* other)
 {
@@ -165,22 +142,6 @@ bool SCA_ILogicBrick::LessComparedTo(SCA_ILogicBrick* other)
 		(this->m_Execute_Priority < other->m_Execute_Priority));
 }
 
-
-
-void SCA_ILogicBrick::SetActive(bool active)
-{
-	m_bActive=active;
-	if (active)
-	{
-		//m_gameobj->SetDebugColor(GetDrawColor());
-	} else
-	{
-		//m_gameobj->ResetDebugColor();
-	}
-}
-
-
-
 void SCA_ILogicBrick::RegisterEvent(CValue* eventval)
 {
 	if (m_eventval)
@@ -217,8 +178,13 @@ CValue* SCA_ILogicBrick::GetEvent()
 /* python stuff */
 
 PyTypeObject SCA_ILogicBrick::Type = {
-	PyObject_HEAD_INIT(NULL)
-	0,
+#if (PY_VERSION_HEX >= 0x02060000)
+	PyVarObject_HEAD_INIT(NULL, 0)
+#else
+	/* python 2.5 and below */
+	PyObject_HEAD_INIT( NULL )  /* required py macro */
+	0,                          /* ob_size */
+#endif
 	"SCA_ILogicBrick",
 	sizeof(PyObjectPlus_Proxy),
 	0,
@@ -256,7 +222,8 @@ PyMethodDef SCA_ILogicBrick::Methods[] = {
 
 PyAttributeDef SCA_ILogicBrick::Attributes[] = {
 	KX_PYATTRIBUTE_RO_FUNCTION("owner",	SCA_ILogicBrick, pyattr_get_owner),
-	KX_PYATTRIBUTE_INT_RW("executePriority",0,100000,false,SCA_ILogicBrick,m_Execute_Ueber_Priority),
+	KX_PYATTRIBUTE_INT_RW("executePriority",0,100000,false,SCA_ILogicBrick,m_Execute_Priority),
+	KX_PYATTRIBUTE_STRING_RO("name", SCA_ILogicBrick, m_name),
 	{NULL} //Sentinel
 };
 
@@ -278,12 +245,15 @@ int SCA_ILogicBrick::CheckProperty(void *self, const PyAttributeDef *attrdef)
 	return 0;
 }
 
-PyObject*
-SCA_ILogicBrick::py_getattro(PyObject *attr)
+PyObject* SCA_ILogicBrick::py_getattro(PyObject *attr)
 {
   py_getattro_up(CValue);
 }
 
+PyObject* SCA_ILogicBrick::py_getattro_dict() {
+	py_getattro_dict_up(CValue);
+}
+
 int SCA_ILogicBrick::py_setattro(PyObject *attr, PyObject *value)
 {
 	py_setattro_up(CValue);
@@ -316,7 +286,7 @@ PyObject* SCA_ILogicBrick::PySetExecutePriority(PyObject* args)
 		return NULL;
     }
 	
-	m_Execute_Ueber_Priority = priority;
+	m_Execute_Priority = priority;
 
 	Py_RETURN_NONE;
 }
@@ -326,7 +296,7 @@ PyObject* SCA_ILogicBrick::PySetExecutePriority(PyObject* args)
 PyObject* SCA_ILogicBrick::PyGetExecutePriority()
 {
 	ShowDeprecationWarning("getExecutePriority()", "the executePriority property");
-	return PyInt_FromLong(m_Execute_Ueber_Priority);
+	return PyInt_FromLong(m_Execute_Priority);
 }