2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323...
[blender.git] / source / gameengine / GameLogic / SCA_ILogicBrick.h
index 38ec80d4096536d33a29919d25b51025ca228460..e59d05ea0516f111bbcccf5a1f1581176dbde646 100644 (file)
@@ -62,13 +62,14 @@ public:
        SCA_IObject*    GetParent();
        virtual void    ReParent(SCA_IObject* parent);
        virtual void    Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
+       virtual void Delete() { Release(); }
 
        // act as a BoolValue (with value IsPositiveTrigger)
        virtual CValue* Calc(VALUE_OPERATOR op, CValue *val);
        virtual CValue* CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val);
 
        virtual const STR_String &      GetText();
-       virtual float           GetNumber();
+       virtual double          GetNumber();
        virtual STR_String      GetName();
        virtual void            SetName(STR_String name);
        virtual void            ReplicaSetName(STR_String name);
@@ -78,7 +79,8 @@ public:
 
        virtual bool            LessComparedTo(SCA_ILogicBrick* other);
        
-       virtual PyObject* _getattr(const STR_String& attr);
+       virtual PyObject* py_getattro(PyObject *attr);
+       virtual int py_setattro(PyObject *attr, PyObject *value);
 
        static class SCA_LogicManager*  m_sCurrentLogicManager;
 
@@ -86,8 +88,10 @@ public:
        // python methods
 
        KX_PYMETHOD_NOARGS(SCA_ILogicBrick,GetOwner);
-       KX_PYMETHOD(SCA_ILogicBrick,SetExecutePriority);
+       KX_PYMETHOD_VARARGS(SCA_ILogicBrick,SetExecutePriority);
        KX_PYMETHOD_NOARGS(SCA_ILogicBrick,GetExecutePriority);
+       
+       static PyObject*        pyattr_get_owner(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 
        // check that attribute is a property
        static int CheckProperty(void *self, const PyAttributeDef *attrdef);