svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20937:21899
[blender.git] / source / gameengine / Ketsji / KXNetwork / KX_NetworkMessageActuator.cpp
index 32f0c3611b7ff331c7059ab79047b893dbacdb90..de820ddaaae98131b99b739a3642eee162695cea 100644 (file)
@@ -41,9 +41,8 @@ KX_NetworkMessageActuator::KX_NetworkMessageActuator(
        const STR_String &toPropName,
        const STR_String &subject,
        int bodyType,
-       const STR_String &body,
-       PyTypeObject* T) :
-       SCA_IActuator(gameobj,T),
+       const STR_String &body) :
+       SCA_IActuator(gameobj),
        m_networkscene(networkscene),
        m_toPropName(toPropName),
        m_subject(subject),
@@ -118,19 +117,15 @@ PyTypeObject KX_NetworkMessageActuator::Type = {
        0,
        0,
        py_base_repr,
-       0,0,0,0,0,0,
-       py_base_getattro,
-       py_base_setattro,
        0,0,0,0,0,0,0,0,0,
-       Methods
-};
-
-PyParentObject KX_NetworkMessageActuator::Parents[] = {
-       &KX_NetworkMessageActuator::Type,
+       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+       0,0,0,0,0,0,0,
+       Methods,
+       0,
+       0,
        &SCA_IActuator::Type,
-       &SCA_ILogicBrick::Type,
-       &CValue::Type,
-       NULL
+       0,0,0,0,0,0,
+       py_base_new
 };
 
 PyMethodDef KX_NetworkMessageActuator::Methods[] = {
@@ -155,18 +150,6 @@ PyAttributeDef KX_NetworkMessageActuator::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObject* KX_NetworkMessageActuator::py_getattro(PyObject *attr) {
-       py_getattro_up(SCA_IActuator);
-}
-
-PyObject* KX_NetworkMessageActuator::py_getattro_dict() {
-       py_getattro_dict_up(SCA_IActuator);
-}
-
-int KX_NetworkMessageActuator::py_setattro(PyObject *attr, PyObject *value) {
-       py_setattro_up(SCA_IActuator);
-}
-
 // Deprecated ----->
 // 1. SetToPropName
 PyObject* KX_NetworkMessageActuator::PySetToPropName(
@@ -240,4 +223,4 @@ PyObject* KX_NetworkMessageActuator::PySetBody(
        Py_RETURN_NONE;
 }
 
-// <----- Deprecated
\ No newline at end of file
+// <----- Deprecated