kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

game engine python api

Browse Source 
* removed macros that were not used much, some misleading.
* removed error string setting calls that overwrote the error set by PyArg_ParseTuple with a less useful one.
* use python macros Py_RETURN_NONE, Py_RETURN_TRUE, Py_RETURN_FALSE
This commit is contained in:
Campbell Barton 2008-08-14 03:23:36 +00:00
parent d2750f7bda
commit 3f2cb6e878
20 changed files with 100 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source/gameengine/Converter/BL_ActionActuator.cpp
View File

@ -484,17 +484,10 @@ char BL_ActionActuator::GetAction_doc[] =
PyObject* BL_ActionActuator::PyGetAction(PyObject* self, PyObject* BL_ActionActuator::PyGetAction(PyObject* self,
PyObject* args, PyObject* args,
PyObject* kwds) { PyObject* kwds) {
PyObject *result;
if (m_action){ if (m_action){
result = Py_BuildValue("s", m_action->id.name+2); return PyString_FromString(m_action->id.name+2);
} }
else{ Py_RETURN_NONE;
Py_INCREF(Py_None);
result = Py_None;
}
return result;
} }
/* getProperty */ /* getProperty */
@ -640,8 +633,7 @@ PyObject* BL_ActionActuator::PySetAction(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setStart */ /* setStart */
@ -662,8 +654,7 @@ PyObject* BL_ActionActuator::PySetStart(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setEnd */ /* setEnd */
@ -684,8 +675,7 @@ PyObject* BL_ActionActuator::PySetEnd(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setBlendin */ /* setBlendin */
@ -707,8 +697,7 @@ PyObject* BL_ActionActuator::PySetBlendin(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setBlendtime */ /* setBlendtime */
@ -735,8 +724,7 @@ PyObject* BL_ActionActuator::PySetBlendtime(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setPriority */ /* setPriority */
@ -759,8 +747,7 @@ PyObject* BL_ActionActuator::PySetPriority(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setFrame */ /* setFrame */
@ -785,8 +772,7 @@ PyObject* BL_ActionActuator::PySetFrame(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setProperty */ /* setProperty */
@ -808,8 +794,7 @@ PyObject* BL_ActionActuator::PySetProperty(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setFrameProperty */ /* setFrameProperty */
@ -830,8 +815,7 @@ PyObject* BL_ActionActuator::PySetFrameProperty(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* /*
@ -848,8 +832,7 @@ PyObject* BL_ActionActuator::PyGetChannel(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
*/ */
@ -934,8 +917,7 @@ PyObject* BL_ActionActuator::PySetChannel(PyObject* self,
} }
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* getType */ /* getType */

44
source/gameengine/Converter/BL_ShapeActionActuator.cpp
View File

@ -464,17 +464,10 @@ char BL_ShapeActionActuator::GetAction_doc[] =
"\tReturns a string containing the name of the current action.\n"; "\tReturns a string containing the name of the current action.\n";
PyObject* BL_ShapeActionActuator::PyGetAction(PyObject* self) { PyObject* BL_ShapeActionActuator::PyGetAction(PyObject* self) {
PyObject *result;
if (m_action){ if (m_action){
result = Py_BuildValue("s", m_action->id.name+2); return PyString_FromString(m_action->id.name+2);
} }
else{ Py_RETURN_NONE;
Py_INCREF(Py_None);
result = Py_None;
}
return result;
} }
/* getProperty */ /* getProperty */
@ -591,12 +584,10 @@ PyObject* BL_ShapeActionActuator::PySetAction(PyObject* self,
} }
} }
else { else {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setStart */ /* setStart */
@ -614,12 +605,10 @@ PyObject* BL_ShapeActionActuator::PySetStart(PyObject* self,
m_startframe = start; m_startframe = start;
} }
else { else {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setEnd */ /* setEnd */
@ -637,12 +626,10 @@ PyObject* BL_ShapeActionActuator::PySetEnd(PyObject* self,
m_endframe = end; m_endframe = end;
} }
else { else {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setBlendin */ /* setBlendin */
@ -661,12 +648,10 @@ PyObject* BL_ShapeActionActuator::PySetBlendin(PyObject* self,
m_blendin = blendin; m_blendin = blendin;
} }
else { else {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setBlendtime */ /* setBlendtime */
@ -690,12 +675,10 @@ PyObject* BL_ShapeActionActuator::PySetBlendtime(PyObject* self,
m_blendframe = m_blendin; m_blendframe = m_blendin;
} }
else { else {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setPriority */ /* setPriority */
@ -715,12 +698,10 @@ PyObject* BL_ShapeActionActuator::PySetPriority(PyObject* self,
m_priority = priority; m_priority = priority;
} }
else { else {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setFrame */ /* setFrame */
@ -742,12 +723,10 @@ PyObject* BL_ShapeActionActuator::PySetFrame(PyObject* self,
m_localtime=m_endframe; m_localtime=m_endframe;
} }
else { else {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* setProperty */ /* setProperty */
@ -766,12 +745,10 @@ PyObject* BL_ShapeActionActuator::PySetProperty(PyObject* self,
m_propname = string; m_propname = string;
} }
else { else {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
/* getType */ /* getType */
@ -793,7 +770,6 @@ PyObject* BL_ShapeActionActuator::PySetType(PyObject* self,
short typeArg; short typeArg;
if (!PyArg_ParseTuple(args, "h", &typeArg)) { if (!PyArg_ParseTuple(args, "h", &typeArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }

5
source/gameengine/Expressions/InputParser.cpp
View File

@ -631,7 +631,8 @@ void CParser::SetContext(CValue* context)
PyObject* CParserPyMake(PyObject* ignored,PyObject* args) PyObject* CParserPyMake(PyObject* ignored,PyObject* args)
{ {
char* txt; char* txt;
Py_Try(PyArg_ParseTuple(args,"s",&txt)); if (!PyArg_ParseTuple(args,"s",&txt))
return NULL;
CParser parser; CParser parser;
CExpression* expr = parser.ProcessText(txt); CExpression* expr = parser.ProcessText(txt);
CValue* val = expr->Calculate(); CValue* val = expr->Calculate();
@ -641,7 +642,7 @@ PyObject* CParserPyMake(PyObject* ignored,PyObject* args)
static PyMethodDef CParserMethods[] = static PyMethodDef CParserMethods[] =
{ {
{ "calc", CParserPyMake , Py_NEWARGS}, { "calc", CParserPyMake , METH_VARARGS},
{ NULL,NULL} // Sentinel { NULL,NULL} // Sentinel
}; };

13
source/gameengine/Expressions/ListValue.cpp
View File

@ -43,7 +43,7 @@ PyObject* listvalue_buffer_item(PyObject* list,Py_ssize_t index)
return ((CListValue*) list)->GetValue(index)->AddRef(); return ((CListValue*) list)->GetValue(index)->AddRef();
} }
Py_Error(PyExc_IndexError, "Python ListIndex out of range"); PyErr_SetString(PyExc_IndexError, "Python ListIndex out of range");
return NULL; return NULL;
} }
@ -130,9 +130,10 @@ listvalue_buffer_concat(PyObject * self, PyObject * other)
} }
} }
if (error) if (error) {
Py_Error(PyExc_SystemError, "Python Error: couldn't add one or more items to a list"); PyErr_SetString(PyExc_SystemError, "Python Error: couldn't add one or more items to a list");
return NULL;
}
} else } else
{ {
@ -155,8 +156,8 @@ listvalue_buffer_concat(PyObject * self, PyObject * other)
listval->Add(objval); listval->Add(objval);
} else } else
{ {
Py_Error(PyExc_SystemError, "Python Error: couldn't add item to a list"); PyErr_SetString(PyExc_SystemError, "Python Error: couldn't add item to a list");
// bad luck return NULL;
} }
} }
} }

12
source/gameengine/Expressions/PyObjectPlus.cpp
View File

@ -94,7 +94,7 @@ PyObjectPlus::PyObjectPlus(PyTypeObject *T) // constructor
* PyObjectPlus Methods -- Every class, even the abstract one should have a Methods * PyObjectPlus Methods -- Every class, even the abstract one should have a Methods
------------------------------*/ ------------------------------*/
PyMethodDef PyObjectPlus::Methods[] = { PyMethodDef PyObjectPlus::Methods[] = {
{"isA", (PyCFunction) sPy_isA, Py_NEWARGS}, {"isA", (PyCFunction) sPy_isA, METH_VARARGS},
{NULL, NULL} /* Sentinel */ {NULL, NULL} /* Sentinel */
}; };
@ -134,7 +134,8 @@ int PyObjectPlus::_setattr(const STR_String& attr, PyObject *value)
------------------------------*/ ------------------------------*/
PyObject *PyObjectPlus::_repr(void) PyObject *PyObjectPlus::_repr(void)
{ {
Py_Error(PyExc_SystemError, "Representation not overridden by object."); PyErr_SetString(PyExc_SystemError, "Representation not overridden by object.");
return NULL;
} }
/*------------------------------ /*------------------------------
@ -164,11 +165,12 @@ bool PyObjectPlus::isA(const char *mytypename) // check typename of each parent
PyObject *PyObjectPlus::Py_isA(PyObject *args) // Python wrapper for isA PyObject *PyObjectPlus::Py_isA(PyObject *args) // Python wrapper for isA
{ {
char *mytypename; char *mytypename;
Py_Try(PyArg_ParseTuple(args, "s", &mytypename)); if (!PyArg_ParseTuple(args, "s", &mytypename))
return NULL;
if(isA(mytypename)) if(isA(mytypename))
{Py_INCREF(Py_True); return Py_True;} Py_RETURN_TRUE;
else else
{Py_INCREF(Py_False); return Py_False;}; Py_RETURN_FALSE;
} }
#endif //NO_EXP_PYTHON_EMBEDDING #endif //NO_EXP_PYTHON_EMBEDDING

15
source/gameengine/Expressions/PyObjectPlus.h
View File

@ -44,22 +44,7 @@
------------------------------*/ ------------------------------*/
// some basic python macros // some basic python macros
#define Py_NEWARGS 1
#define Py_Return { Py_INCREF(Py_None); return Py_None;} #define Py_Return { Py_INCREF(Py_None); return Py_None;}
static inline PyObject* Py_Success(bool truth)
{
if (truth)
{
Py_INCREF(Py_True);
return Py_True;
}
Py_INCREF(Py_False);
return Py_False;
}
#define Py_Error(E, M) {PyErr_SetString(E, M); return NULL;}
#define Py_Try(F) {if (!(F)) return NULL;}
#define Py_Assert(A,E,M) {if (!(A)) {PyErr_SetString(E, M); return NULL;}}
static inline void Py_Fatal(char *M) { static inline void Py_Fatal(char *M) {
//cout << M << endl; //cout << M << endl;

16
source/gameengine/Expressions/Value.cpp
View File

@ -158,15 +158,14 @@ PyParentObject CValue::Parents[] = {
}; };
PyMethodDef CValue::Methods[] = { PyMethodDef CValue::Methods[] = {
// { "printHello", (PyCFunction) CValue::sPyPrintHello, Py_NEWARGS}, // { "printHello", (PyCFunction) CValue::sPyPrintHello, METH_VARARGS},
{ "getName", (PyCFunction) CValue::sPyGetName, Py_NEWARGS}, { "getName", (PyCFunction) CValue::sPyGetName, METH_NOARGS},
{NULL,NULL} //Sentinel {NULL,NULL} //Sentinel
}; };
PyObject* CValue::PyGetName(PyObject* self,PyObject* args,PyObject* kwds) PyObject* CValue::PyGetName(PyObject* self)
{ {
PyObject* pyname = PyString_FromString(this->GetName()); return PyString_FromString(this->GetName());
return pyname;
} }
/*#define CVALUE_DEBUG*/ /*#define CVALUE_DEBUG*/
@ -662,7 +661,7 @@ CValue* CValue::FindIdentifier(const STR_String& identifiername)
static PyMethodDef CValueMethods[] = static PyMethodDef CValueMethods[] =
{ {
//{ "new", CValue::PyMake , Py_NEWARGS}, //{ "new", CValue::PyMake , METH_VARARGS},
{ NULL,NULL} // Sentinel { NULL,NULL} // Sentinel
}; };
@ -806,9 +805,8 @@ PyObject* CValue::ConvertKeysToPython( void )
PyObject* CValue::PyMake(PyObject* ignored,PyObject* args) PyObject* CValue::PyMake(PyObject* ignored,PyObject* args)
{ {
//Py_Try(PyArg_ParseTuple(args,"s",&name)); //if (!PyArg_ParseTuple(args,"s",&name)) return NULL;
Py_INCREF(Py_None); Py_RETURN_NONE;//new CValue();
return Py_None;//new CValue();
} }
*/ */

2
source/gameengine/Expressions/Value.h
View File

@ -255,7 +255,7 @@ public:
virtual PyObject* ConvertKeysToPython( void ); virtual PyObject* ConvertKeysToPython( void );
KX_PYMETHOD(CValue,GetName); KX_PYMETHOD_NOARGS(CValue,GetName);
#else #else
CValue(); CValue();

1
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
View File

@ -180,7 +180,6 @@ PyObject* SCA_ActuatorSensor::PySetActuator(PyObject* self, PyObject* args, PyOb
char *actNameArg = NULL; char *actNameArg = NULL;
if (!PyArg_ParseTuple(args, "s", &actNameArg)) { if (!PyArg_ParseTuple(args, "s", &actNameArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }

3
source/gameengine/GameLogic/SCA_ILogicBrick.cpp
View File

@ -271,8 +271,7 @@ PyObject* SCA_ILogicBrick::PyGetOwner(PyObject* self)
} }
printf("ERROR: Python scriptblock without owner\n"); printf("ERROR: Python scriptblock without owner\n");
Py_INCREF(Py_None); Py_RETURN_NONE; //Int_FromLong(IsPositiveTrigger());
return Py_None;//Int_FromLong(IsPositiveTrigger());
} }

50
source/gameengine/Ketsji/BL_Shader.cpp
View File

@ -846,8 +846,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, getFragmentProg ,"getFragmentProg( )" )
KX_PYMETHODDEF_DOC( BL_Shader, validate, "validate()") KX_PYMETHODDEF_DOC( BL_Shader, validate, "validate()")
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
if(mShader==0) { if(mShader==0) {
PyErr_Format(PyExc_TypeError, "invalid shader object"); PyErr_Format(PyExc_TypeError, "invalid shader object");
@ -877,8 +876,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, validate, "validate()")
KX_PYMETHODDEF_DOC( BL_Shader, setSampler, "setSampler(name, index)" ) KX_PYMETHODDEF_DOC( BL_Shader, setSampler, "setSampler(name, index)" )
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
char *uniform=""; char *uniform="";
@ -900,7 +898,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setSampler, "setSampler(name, index)" )
//else //else
// spit("Invalid texture sample index: " << index); // spit("Invalid texture sample index: " << index);
} }
Py_Return; Py_RETURN_NONE;
} }
return NULL; return NULL;
} }
@ -919,8 +917,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setNumberOfPasses, "setNumberOfPasses( max-pass )
KX_PYMETHODDEF_DOC( BL_Shader, setUniform1f, "setUniform1f(name, fx)" ) KX_PYMETHODDEF_DOC( BL_Shader, setUniform1f, "setUniform1f(name, fx)" )
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
char *uniform=""; char *uniform="";
@ -945,8 +942,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform1f, "setUniform1f(name, fx)" )
KX_PYMETHODDEF_DOC( BL_Shader, setUniform2f , "setUniform2f(name, fx, fy)") KX_PYMETHODDEF_DOC( BL_Shader, setUniform2f , "setUniform2f(name, fx, fy)")
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
char *uniform=""; char *uniform="";
float array[2]={ 0,0 }; float array[2]={ 0,0 };
@ -970,8 +966,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform2f , "setUniform2f(name, fx, fy)")
KX_PYMETHODDEF_DOC( BL_Shader, setUniform3f, "setUniform3f(name, fx,fy,fz) ") KX_PYMETHODDEF_DOC( BL_Shader, setUniform3f, "setUniform3f(name, fx,fy,fz) ")
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
char *uniform=""; char *uniform="";
float array[3]={0,0,0}; float array[3]={0,0,0};
@ -996,8 +991,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform3f, "setUniform3f(name, fx,fy,fz) ")
KX_PYMETHODDEF_DOC( BL_Shader, setUniform4f, "setUniform4f(name, fx,fy,fz, fw) ") KX_PYMETHODDEF_DOC( BL_Shader, setUniform4f, "setUniform4f(name, fx,fy,fz, fw) ")
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
char *uniform=""; char *uniform="";
float array[4]={0,0,0,0}; float array[4]={0,0,0,0};
@ -1021,8 +1015,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform4f, "setUniform4f(name, fx,fy,fz, fw) "
KX_PYMETHODDEF_DOC( BL_Shader, setUniform1i, "setUniform1i(name, ix)" ) KX_PYMETHODDEF_DOC( BL_Shader, setUniform1i, "setUniform1i(name, ix)" )
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
char *uniform=""; char *uniform="";
int value=0; int value=0;
@ -1046,8 +1039,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform1i, "setUniform1i(name, ix)" )
KX_PYMETHODDEF_DOC( BL_Shader, setUniform2i , "setUniform2i(name, ix, iy)") KX_PYMETHODDEF_DOC( BL_Shader, setUniform2i , "setUniform2i(name, ix, iy)")
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
char *uniform=""; char *uniform="";
int array[2]={ 0,0 }; int array[2]={ 0,0 };
@ -1071,8 +1063,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform2i , "setUniform2i(name, ix, iy)")
KX_PYMETHODDEF_DOC( BL_Shader, setUniform3i, "setUniform3i(name, ix,iy,iz) ") KX_PYMETHODDEF_DOC( BL_Shader, setUniform3i, "setUniform3i(name, ix,iy,iz) ")
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
char *uniform=""; char *uniform="";
@ -1096,8 +1087,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform3i, "setUniform3i(name, ix,iy,iz) ")
KX_PYMETHODDEF_DOC( BL_Shader, setUniform4i, "setUniform4i(name, ix,iy,iz, iw) ") KX_PYMETHODDEF_DOC( BL_Shader, setUniform4i, "setUniform4i(name, ix,iy,iz, iw) ")
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
char *uniform=""; char *uniform="";
int array[4]={0,0,0, 0}; int array[4]={0,0,0, 0};
@ -1120,8 +1110,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniform4i, "setUniform4i(name, ix,iy,iz, iw) "
KX_PYMETHODDEF_DOC( BL_Shader, setUniformfv , "setUniformfv( float (list2 or list3 or list4) )") KX_PYMETHODDEF_DOC( BL_Shader, setUniformfv , "setUniformfv( float (list2 or list3 or list4) )")
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
char*uniform = ""; char*uniform = "";
PyObject *listPtr =0; PyObject *listPtr =0;
@ -1190,8 +1179,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformfv , "setUniformfv( float (list2 or lis
KX_PYMETHODDEF_DOC( BL_Shader, setUniformiv, "setUniformiv( int (list2 or list3 or list4) )") KX_PYMETHODDEF_DOC( BL_Shader, setUniformiv, "setUniformiv( int (list2 or list3 or list4) )")
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
char*uniform = ""; char*uniform = "";
PyObject *listPtr =0; PyObject *listPtr =0;
@ -1263,8 +1251,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformMatrix4,
"setUniformMatrix4(uniform-name, mat-4x4, transpose(row-major=true, col-major=false)" ) "setUniformMatrix4(uniform-name, mat-4x4, transpose(row-major=true, col-major=false)" )
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
float matr[16] = { float matr[16] = {
@ -1306,8 +1293,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformMatrix3,
"setUniformMatrix3(uniform-name, list[3x3], transpose(row-major=true, col-major=false)" ) "setUniformMatrix3(uniform-name, list[3x3], transpose(row-major=true, col-major=false)" )
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
float matr[9] = { float matr[9] = {
@ -1347,8 +1333,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformMatrix3,
KX_PYMETHODDEF_DOC( BL_Shader, setAttrib, "setAttrib(enum)" ) KX_PYMETHODDEF_DOC( BL_Shader, setAttrib, "setAttrib(enum)" )
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
int attr=0; int attr=0;
if(PyArg_ParseTuple(args, "i", &attr )) { if(PyArg_ParseTuple(args, "i", &attr )) {
@ -1368,8 +1353,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setAttrib, "setAttrib(enum)" )
KX_PYMETHODDEF_DOC( BL_Shader, setUniformDef, "setUniformDef(name, enum)" ) KX_PYMETHODDEF_DOC( BL_Shader, setUniformDef, "setUniformDef(name, enum)" )
{ {
if(mError) { if(mError) {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
char *uniform=""; char *uniform="";

9
source/gameengine/Ketsji/KX_ConstraintActuator.cpp
View File

@ -476,7 +476,6 @@ PyObject* KX_ConstraintActuator::PySetDamp(PyObject* self,
PyObject* kwds) { PyObject* kwds) {
int dampArg; int dampArg;
if(!PyArg_ParseTuple(args, "i", &dampArg)) { if(!PyArg_ParseTuple(args, "i", &dampArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
@ -504,7 +503,6 @@ PyObject* KX_ConstraintActuator::PySetRotDamp(PyObject* self,
PyObject* kwds) { PyObject* kwds) {
int dampArg; int dampArg;
if(!PyArg_ParseTuple(args, "i", &dampArg)) { if(!PyArg_ParseTuple(args, "i", &dampArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
@ -534,7 +532,6 @@ PyObject* KX_ConstraintActuator::PySetDirection(PyObject* self,
MT_Vector3 dir; MT_Vector3 dir;
if(!PyArg_ParseTuple(args, "(fff)", &x, &y, &z)) { if(!PyArg_ParseTuple(args, "(fff)", &x, &y, &z)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
dir[0] = x; dir[0] = x;
@ -577,7 +574,6 @@ PyObject* KX_ConstraintActuator::PySetOption(PyObject* self,
PyObject* kwds) { PyObject* kwds) {
int option; int option;
if(!PyArg_ParseTuple(args, "i", &option)) { if(!PyArg_ParseTuple(args, "i", &option)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
@ -605,7 +601,6 @@ PyObject* KX_ConstraintActuator::PySetTime(PyObject* self,
PyObject* kwds) { PyObject* kwds) {
int t; int t;
if(!PyArg_ParseTuple(args, "i", &t)) { if(!PyArg_ParseTuple(args, "i", &t)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
@ -634,7 +629,6 @@ PyObject* KX_ConstraintActuator::PySetProperty(PyObject* self,
PyObject* kwds) { PyObject* kwds) {
char *property; char *property;
if (!PyArg_ParseTuple(args, "s", &property)) { if (!PyArg_ParseTuple(args, "s", &property)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
if (property == NULL) { if (property == NULL) {
@ -670,7 +664,6 @@ PyObject* KX_ConstraintActuator::PySetMin(PyObject* self,
PyObject* kwds) { PyObject* kwds) {
float minArg; float minArg;
if(!PyArg_ParseTuple(args, "f", &minArg)) { if(!PyArg_ParseTuple(args, "f", &minArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
@ -716,7 +709,6 @@ PyObject* KX_ConstraintActuator::PySetMax(PyObject* self,
PyObject* kwds){ PyObject* kwds){
float maxArg; float maxArg;
if(!PyArg_ParseTuple(args, "f", &maxArg)) { if(!PyArg_ParseTuple(args, "f", &maxArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
@ -770,7 +762,6 @@ PyObject* KX_ConstraintActuator::PySetLimit(PyObject* self,
PyObject* kwds) { PyObject* kwds) {
int locrotArg; int locrotArg;
if(!PyArg_ParseTuple(args, "i", &locrotArg)) { if(!PyArg_ParseTuple(args, "i", &locrotArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }

3
source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
View File

@ -53,8 +53,7 @@ PyObject* KX_ConstraintWrapper::PyTestMethod(PyObject* self,
PyObject* kwds) PyObject* kwds)
{ {
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
PyObject* KX_ConstraintWrapper::PyGetConstraintId(PyObject* self, PyObject* KX_ConstraintWrapper::PyGetConstraintId(PyObject* self,

8
source/gameengine/Ketsji/KX_IpoActuator.cpp
View File

@ -480,7 +480,6 @@ PyObject* KX_IpoActuator::PySet(PyObject* self,
int startFrame, stopFrame; int startFrame, stopFrame;
if(!PyArg_ParseTuple(args, "siii", &mode, &startFrame, if(!PyArg_ParseTuple(args, "siii", &mode, &startFrame,
&stopFrame, &forceToggle)) { &stopFrame, &forceToggle)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
modenum = string2mode(mode); modenum = string2mode(mode);
@ -516,7 +515,6 @@ PyObject* KX_IpoActuator::PySetProperty(PyObject* self,
/* args: property */ /* args: property */
char *propertyName; char *propertyName;
if(!PyArg_ParseTuple(args, "s", &propertyName)) { if(!PyArg_ParseTuple(args, "s", &propertyName)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
@ -535,7 +533,6 @@ PyObject* KX_IpoActuator::PySetStart(PyObject* self,
PyObject* kwds) { PyObject* kwds) {
float startArg; float startArg;
if(!PyArg_ParseTuple(args, "f", &startArg)) { if(!PyArg_ParseTuple(args, "f", &startArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
@ -561,7 +558,6 @@ PyObject* KX_IpoActuator::PySetEnd(PyObject* self,
PyObject* kwds) { PyObject* kwds) {
float endArg; float endArg;
if(!PyArg_ParseTuple(args, "f", &endArg)) { if(!PyArg_ParseTuple(args, "f", &endArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
@ -588,7 +584,6 @@ PyObject* KX_IpoActuator::PySetIpoAsForce(PyObject* self,
int boolArg; int boolArg;
if (!PyArg_ParseTuple(args, "i", &boolArg)) { if (!PyArg_ParseTuple(args, "i", &boolArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
@ -617,7 +612,6 @@ PyObject* KX_IpoActuator::PySetIpoAdd(PyObject* self,
int boolArg; int boolArg;
if (!PyArg_ParseTuple(args, "i", &boolArg)) { if (!PyArg_ParseTuple(args, "i", &boolArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
@ -646,7 +640,6 @@ PyObject* KX_IpoActuator::PySetType(PyObject* self,
int typeArg; int typeArg;
if (!PyArg_ParseTuple(args, "i", &typeArg)) { if (!PyArg_ParseTuple(args, "i", &typeArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
@ -678,7 +671,6 @@ PyObject* KX_IpoActuator::PySetForceIpoActsLocal(PyObject* self,
int boolArg; int boolArg;
if (!PyArg_ParseTuple(args, "i", &boolArg)) { if (!PyArg_ParseTuple(args, "i", &boolArg)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }

2
source/gameengine/Ketsji/KX_MeshProxy.cpp
View File

@ -238,5 +238,5 @@ KX_PYMETHODDEF_DOC(KX_MeshProxy, reinstancePhysicsMesh,
"Reinstance the physics mesh.") "Reinstance the physics mesh.")
{ {
//this needs to be reviewed, it is dependend on Sumo/Solid. Who is using this ? //this needs to be reviewed, it is dependend on Sumo/Solid. Who is using this ?
return Py_None;//Py_Success(KX_ReInstanceShapeFromMesh(m_meshobj)); return Py_None;//(KX_ReInstanceShapeFromMesh(m_meshobj)) ? Py_RETURN_TRUE : Py_RETURN_FALSE;
} }

11
source/gameengine/Ketsji/KX_ObjectActuator.cpp
View File

@ -360,7 +360,6 @@ PyObject* KX_ObjectActuator::PySetForce(PyObject* self,
int bToggle = 0; int bToggle = 0;
if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1], if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1],
&vecArg[2], &bToggle)) { &vecArg[2], &bToggle)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
m_force.setValue(vecArg); m_force.setValue(vecArg);
@ -390,7 +389,6 @@ PyObject* KX_ObjectActuator::PySetTorque(PyObject* self,
int bToggle = 0; int bToggle = 0;
if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1], if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1],
&vecArg[2], &bToggle)) { &vecArg[2], &bToggle)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
m_torque.setValue(vecArg); m_torque.setValue(vecArg);
@ -420,7 +418,6 @@ PyObject* KX_ObjectActuator::PySetDLoc(PyObject* self,
int bToggle = 0; int bToggle = 0;
if(!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1], if(!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1],
&vecArg[2], &bToggle)) { &vecArg[2], &bToggle)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
m_dloc.setValue(vecArg); m_dloc.setValue(vecArg);
@ -450,7 +447,6 @@ PyObject* KX_ObjectActuator::PySetDRot(PyObject* self,
int bToggle = 0; int bToggle = 0;
if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1], if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1],
&vecArg[2], &bToggle)) { &vecArg[2], &bToggle)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
m_drot.setValue(vecArg); m_drot.setValue(vecArg);
@ -479,7 +475,6 @@ PyObject* KX_ObjectActuator::PySetLinearVelocity(PyObject* self,
int bToggle = 0; int bToggle = 0;
if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1], if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1],
&vecArg[2], &bToggle)) { &vecArg[2], &bToggle)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
m_linear_velocity.setValue(vecArg); m_linear_velocity.setValue(vecArg);
@ -508,7 +503,6 @@ PyObject* KX_ObjectActuator::PySetAngularVelocity(PyObject* self,
int bToggle = 0; int bToggle = 0;
if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1], if (!PyArg_ParseTuple(args, "fffi", &vecArg[0], &vecArg[1],
&vecArg[2], &bToggle)) { &vecArg[2], &bToggle)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
m_angular_velocity.setValue(vecArg); m_angular_velocity.setValue(vecArg);
@ -523,7 +517,6 @@ PyObject* KX_ObjectActuator::PySetDamping(PyObject* self,
PyObject* kwds) { PyObject* kwds) {
int damping = 0; int damping = 0;
if (!PyArg_ParseTuple(args, "i", &damping) || damping < 0 || damping > 1000) { if (!PyArg_ParseTuple(args, "i", &damping) || damping < 0 || damping > 1000) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
m_damping = damping; m_damping = damping;
@ -553,7 +546,6 @@ PyObject* KX_ObjectActuator::PySetForceLimitX(PyObject* self,
float vecArg[2]; float vecArg[2];
int bToggle = 0; int bToggle = 0;
if(!PyArg_ParseTuple(args, "ffi", &vecArg[0], &vecArg[1], &bToggle)) { if(!PyArg_ParseTuple(args, "ffi", &vecArg[0], &vecArg[1], &bToggle)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
m_drot[0] = vecArg[0]; m_drot[0] = vecArg[0];
@ -581,7 +573,6 @@ PyObject* KX_ObjectActuator::PySetForceLimitY(PyObject* self,
float vecArg[2]; float vecArg[2];
int bToggle = 0; int bToggle = 0;
if(!PyArg_ParseTuple(args, "ffi", &vecArg[0], &vecArg[1], &bToggle)) { if(!PyArg_ParseTuple(args, "ffi", &vecArg[0], &vecArg[1], &bToggle)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
m_drot[1] = vecArg[0]; m_drot[1] = vecArg[0];
@ -609,7 +600,6 @@ PyObject* KX_ObjectActuator::PySetForceLimitZ(PyObject* self,
float vecArg[2]; float vecArg[2];
int bToggle = 0; int bToggle = 0;
if(!PyArg_ParseTuple(args, "ffi", &vecArg[0], &vecArg[1], &bToggle)) { if(!PyArg_ParseTuple(args, "ffi", &vecArg[0], &vecArg[1], &bToggle)) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
m_drot[2] = vecArg[0]; m_drot[2] = vecArg[0];
@ -636,7 +626,6 @@ PyObject* KX_ObjectActuator::PySetPID(PyObject* self,
{ {
float vecArg[3]; float vecArg[3];
if (!PyArg_ParseTuple(args, "fff", &vecArg[0], &vecArg[1], &vecArg[2])) { if (!PyArg_ParseTuple(args, "fff", &vecArg[0], &vecArg[1], &vecArg[2])) {
PyErr_SetString(PyExc_TypeError, "Invalid arguments");
return NULL; return NULL;
} }
m_torque.setValue(vecArg); m_torque.setValue(vecArg);

8
source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
View File

@ -61,7 +61,7 @@ PyObject* KX_PhysicsObjectWrapper::PySetPosition(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
@ -78,7 +78,7 @@ PyObject* KX_PhysicsObjectWrapper::PySetLinearVelocity(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
PyObject* KX_PhysicsObjectWrapper::PySetAngularVelocity(PyObject* self, PyObject* KX_PhysicsObjectWrapper::PySetAngularVelocity(PyObject* self,
@ -94,7 +94,7 @@ PyObject* KX_PhysicsObjectWrapper::PySetAngularVelocity(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
PyObject* KX_PhysicsObjectWrapper::PySetActive(PyObject* self, PyObject* KX_PhysicsObjectWrapper::PySetActive(PyObject* self,
@ -109,7 +109,7 @@ PyObject* KX_PhysicsObjectWrapper::PySetActive(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }

36
source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
View File

@ -91,7 +91,7 @@ static PyObject* gPySetGravity(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
static PyObject* gPySetDebugMode(PyObject* self, static PyObject* gPySetDebugMode(PyObject* self,
@ -112,7 +112,7 @@ static PyObject* gPySetDebugMode(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
@ -132,7 +132,7 @@ static PyObject* gPySetNumTimeSubSteps(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
@ -151,7 +151,7 @@ static PyObject* gPySetNumIterations(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
@ -171,7 +171,7 @@ static PyObject* gPySetDeactivationTime(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
@ -190,7 +190,7 @@ static PyObject* gPySetDeactivationLinearTreshold(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
@ -209,7 +209,7 @@ static PyObject* gPySetDeactivationAngularTreshold(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
static PyObject* gPySetContactBreakingTreshold(PyObject* self, static PyObject* gPySetContactBreakingTreshold(PyObject* self,
@ -227,7 +227,7 @@ static PyObject* gPySetContactBreakingTreshold(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
@ -246,7 +246,7 @@ static PyObject* gPySetCcdMode(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
static PyObject* gPySetSorConstant(PyObject* self, static PyObject* gPySetSorConstant(PyObject* self,
@ -264,7 +264,7 @@ static PyObject* gPySetSorConstant(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
static PyObject* gPySetSolverTau(PyObject* self, static PyObject* gPySetSolverTau(PyObject* self,
@ -282,7 +282,7 @@ static PyObject* gPySetSolverTau(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
@ -301,7 +301,7 @@ static PyObject* gPySetSolverDamping(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
static PyObject* gPySetLinearAirDamping(PyObject* self, static PyObject* gPySetLinearAirDamping(PyObject* self,
@ -319,7 +319,7 @@ static PyObject* gPySetLinearAirDamping(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
@ -338,7 +338,7 @@ static PyObject* gPySetUseEpa(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
static PyObject* gPySetSolverType(PyObject* self, static PyObject* gPySetSolverType(PyObject* self,
PyObject* args, PyObject* args,
@ -355,7 +355,7 @@ static PyObject* gPySetSolverType(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
@ -388,7 +388,7 @@ static PyObject* gPyGetVehicleConstraint(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
@ -448,7 +448,7 @@ static PyObject* gPyCreateConstraint(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }
@ -502,7 +502,7 @@ static PyObject* gPyRemoveConstraint(PyObject* self,
return NULL; return NULL;
} }
Py_INCREF(Py_None); return Py_None; Py_RETURN_NONE;
} }

3
source/gameengine/Ketsji/KX_PythonInit.cpp
View File

@ -355,8 +355,7 @@ static PyObject *pyPrintExt(PyObject *,PyObject *,PyObject *)
if(!count) if(!count)
pprint("No extenstions are used in this build"); pprint("No extenstions are used in this build");
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }

27
source/gameengine/Ketsji/KX_VehicleWrapper.cpp
View File

@ -71,8 +71,7 @@ PyObject* KX_VehicleWrapper::PyAddWheel(PyObject* self,
} else { } else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
@ -157,8 +156,7 @@ PyObject* KX_VehicleWrapper::PyApplyEngineForce(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
PyObject* KX_VehicleWrapper::PySetTyreFriction(PyObject* self, PyObject* KX_VehicleWrapper::PySetTyreFriction(PyObject* self,
@ -175,8 +173,7 @@ PyObject* KX_VehicleWrapper::PySetTyreFriction(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
PyObject* KX_VehicleWrapper::PySetSuspensionStiffness(PyObject* self, PyObject* KX_VehicleWrapper::PySetSuspensionStiffness(PyObject* self,
@ -193,8 +190,7 @@ PyObject* KX_VehicleWrapper::PySetSuspensionStiffness(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
PyObject* KX_VehicleWrapper::PySetSuspensionDamping(PyObject* self, PyObject* KX_VehicleWrapper::PySetSuspensionDamping(PyObject* self,
@ -210,8 +206,7 @@ PyObject* KX_VehicleWrapper::PySetSuspensionDamping(PyObject* self,
} else { } else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
PyObject* KX_VehicleWrapper::PySetSuspensionCompression(PyObject* self, PyObject* KX_VehicleWrapper::PySetSuspensionCompression(PyObject* self,
@ -227,8 +222,7 @@ PyObject* KX_VehicleWrapper::PySetSuspensionCompression(PyObject* self,
} else { } else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
PyObject* KX_VehicleWrapper::PySetRollInfluence(PyObject* self, PyObject* KX_VehicleWrapper::PySetRollInfluence(PyObject* self,
@ -245,8 +239,7 @@ PyObject* KX_VehicleWrapper::PySetRollInfluence(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
@ -264,8 +257,7 @@ PyObject* KX_VehicleWrapper::PyApplyBraking(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }
@ -285,8 +277,7 @@ PyObject* KX_VehicleWrapper::PySetSteeringValue(PyObject* self,
else { else {
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_RETURN_NONE;
return Py_None;
} }