svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / gameengine / Ketsji / KX_StateActuator.cpp
index f6979eee0f40de44279421ffef7cf5751ddd92a2..9815d6274aa4af3ebd303ee66f721eb9068cce49 100644 (file)
 KX_StateActuator::KX_StateActuator(
        SCA_IObject* gameobj,
        int operation,
-       unsigned int mask,
-       PyTypeObject* T
+       unsigned int mask
        ) 
-       : SCA_IActuator(gameobj,T),
+       : SCA_IActuator(gameobj),
          m_operation(operation),
          m_mask(mask)
 {
@@ -154,24 +153,18 @@ PyTypeObject KX_StateActuator::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_StateActuator::Parents[] = {
-       &KX_StateActuator::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_StateActuator::Methods[] = {
+PyMethodDef KX_StateActuator::Methods[] = {
        // deprecated -->
        {"setOperation", (PyCFunction) KX_StateActuator::sPySetOperation, 
         METH_VARARGS, (PY_METHODCHAR)SetOperation_doc},
@@ -187,20 +180,6 @@ PyAttributeDef KX_StateActuator::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObject* KX_StateActuator::py_getattro(PyObject *attr)
-{
-       py_getattro_up(SCA_IActuator);
-}
-
-PyObject* KX_StateActuator::py_getattro_dict() {
-       py_getattro_dict_up(SCA_IActuator);
-}
-
-int KX_StateActuator::py_setattro(PyObject *attr, PyObject* value)
-{
-       py_setattro_up(SCA_IActuator);
-}
-
 
 /* set operation ---------------------------------------------------------- */
 const char