diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-28 21:42:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-28 21:42:41 +0300 |
| commit | 7348a50d7917252a49ef26afd2e7bbfb26c49dbe (patch) | |
| tree | 36817186e338f5d2b9292ef74d24bab29e9278ba /source/gameengine/Ketsji/KX_ObjectActuator.cpp | |
| parent | 506e8aa43786f80c60979fb53ba38288cfe193ad (diff) | |
change return values from mathutils callbacks to match pythons (-1 is error), so error macro's can be used in both.
Diffstat (limited to 'source/gameengine/Ketsji/KX_ObjectActuator.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_ObjectActuator.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/gameengine/Ketsji/KX_ObjectActuator.cpp b/source/gameengine/Ketsji/KX_ObjectActuator.cpp index 83d8f4b883b..977e32a4c7f 100644 --- a/source/gameengine/Ketsji/KX_ObjectActuator.cpp +++ b/source/gameengine/Ketsji/KX_ObjectActuator.cpp @@ -392,16 +392,16 @@ static int mathutils_obactu_generic_check(BaseMathObject *bmo) { KX_ObjectActuator* self= static_cast<KX_ObjectActuator*>BGE_PROXY_REF(bmo->cb_user); if(self==NULL) - return 0; + return -1; - return 1; + return 0; } static int mathutils_obactu_vector_get(BaseMathObject *bmo, int subtype) { KX_ObjectActuator* self= static_cast<KX_ObjectActuator*>BGE_PROXY_REF(bmo->cb_user); if(self==NULL) - return 0; + return -1; switch(subtype) { case MATHUTILS_VEC_CB_LINV: @@ -412,14 +412,14 @@ static int mathutils_obactu_vector_get(BaseMathObject *bmo, int subtype) break; } - return 1; + return 0; } static int mathutils_obactu_vector_set(BaseMathObject *bmo, int subtype) { KX_ObjectActuator* self= static_cast<KX_ObjectActuator*>BGE_PROXY_REF(bmo->cb_user); if(self==NULL) - return 0; + return -1; switch(subtype) { case MATHUTILS_VEC_CB_LINV: @@ -430,15 +430,15 @@ static int mathutils_obactu_vector_set(BaseMathObject *bmo, int subtype) break; } - return 1; + return 0; } static int mathutils_obactu_vector_get_index(BaseMathObject *bmo, int subtype, int index) { /* lazy, avoid repeteing the case statement */ if(!mathutils_obactu_vector_get(bmo, subtype)) - return 0; - return 1; + return -1; + return 0; } static int mathutils_obactu_vector_set_index(BaseMathObject *bmo, int subtype, int index) @@ -447,7 +447,7 @@ static int mathutils_obactu_vector_set_index(BaseMathObject *bmo, int subtype, i /* lazy, avoid repeteing the case statement */ if(!mathutils_obactu_vector_get(bmo, subtype)) - return 0; + return -1; bmo->data[index]= f; return mathutils_obactu_vector_set(bmo, subtype); |