svn merge -r 21041:21301 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
[blender.git] / source / gameengine / GameLogic / SCA_XORController.cpp
index 5afb3a750f5662d5fc67116d2336a4f77fa16c1d..c0916224fe6e6ea9b4ceeb1a9387955ab3a60e69 100644 (file)
 /* Native functions                                                          */
 /* ------------------------------------------------------------------------- */
 
-SCA_XORController::SCA_XORController(SCA_IObject* gameobj,
-                                                                        PyTypeObject* T)
+SCA_XORController::SCA_XORController(SCA_IObject* gameobj)
        :
-       SCA_IController(gameobj,T)
+       SCA_IController(gameobj)
 {
 }
 
@@ -120,19 +119,15 @@ PyTypeObject SCA_XORController::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 SCA_XORController::Parents[] = {
-       &SCA_XORController::Type,
+       Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+       0,0,0,0,0,0,0,
+       Methods,
+       0,
+       0,
        &SCA_IController::Type,
-       &SCA_ILogicBrick::Type,
-       &CValue::Type,
-       NULL
+       0,0,0,0,0,0,
+       py_base_new
 };
 
 PyMethodDef SCA_XORController::Methods[] = {
@@ -143,12 +138,4 @@ PyAttributeDef SCA_XORController::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-PyObject* SCA_XORController::py_getattro(PyObject *attr) {
-       py_getattro_up(SCA_IController);
-}
-
-PyObject* SCA_XORController::py_getattro_dict() {
-       py_getattro_dict_up(SCA_IController);
-}
-
 /* eof */