2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323...
[blender.git] / source / gameengine / Ketsji / KX_IpoActuator.h
index 12e1835..184ad55 100644 (file)
@@ -108,9 +108,9 @@ public:
        static STR_String S_KX_ACT_IPO_KEY2KEY_STRING;
        static STR_String S_KX_ACT_IPO_FROM_PROP_STRING;
 
-       IpoActType string2mode(char* modename);
+       int string2mode(char* modename);
        
-       IpoActType      m_type;
+       int m_type;
 
        KX_IpoActuator(SCA_IObject* gameobj,
                                   const STR_String& propname,
@@ -141,22 +141,24 @@ public:
        /* Python interface ---------------------------------------------------- */
        /* --------------------------------------------------------------------- */
 
-       virtual PyObject* _getattr(const char *attr);
+       virtual PyObject* py_getattro(PyObject *attr);
+       virtual int py_setattro(PyObject *attr, PyObject *value);
+       
        //KX_PYMETHOD_DOC
-       KX_PYMETHOD_DOC(KX_IpoActuator,Set);
-       KX_PYMETHOD_DOC(KX_IpoActuator,SetProperty);
+       KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,Set);
+       KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetProperty);
 /*     KX_PYMETHOD_DOC(KX_IpoActuator,SetKey2Key); */
-       KX_PYMETHOD_DOC(KX_IpoActuator,SetStart);
+       KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetStart);
        KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetStart);
-       KX_PYMETHOD_DOC(KX_IpoActuator,SetEnd);
+       KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetEnd);
        KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetEnd);
-       KX_PYMETHOD_DOC(KX_IpoActuator,SetIpoAsForce);
+       KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetIpoAsForce);
        KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetIpoAsForce);
-       KX_PYMETHOD_DOC(KX_IpoActuator,SetIpoAdd);
+       KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetIpoAdd);
        KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetIpoAdd);
-       KX_PYMETHOD_DOC(KX_IpoActuator,SetType);
+       KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetType);
        KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetType);
-       KX_PYMETHOD_DOC(KX_IpoActuator,SetForceIpoActsLocal);
+       KX_PYMETHOD_DOC_VARARGS(KX_IpoActuator,SetForceIpoActsLocal);
        KX_PYMETHOD_DOC_NOARGS(KX_IpoActuator,GetForceIpoActsLocal);
        
 };