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

return dummy python values when no joystick is present

Browse Source
This commit is contained in:
Campbell Barton 2008-09-13 11:43:01 +00:00
parent a9a8f74b80
commit dfb5ebb12e
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/gameengine/GameLogic/SCA_JoystickSensor.cpp
View File

@ -402,7 +402,8 @@ PyObject* SCA_JoystickSensor::PyGetRealAxis( PyObject* self) {
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex); SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
if(joy) if(joy)
return Py_BuildValue("[iiii]", joy->GetAxis10(), joy->GetAxis11(), joy->GetAxis20(), joy->GetAxis21()); return Py_BuildValue("[iiii]", joy->GetAxis10(), joy->GetAxis11(), joy->GetAxis20(), joy->GetAxis21());
return NULL; else
return Py_BuildValue("[iiii]", 0, 0, 0, 0);
} }
@ -483,9 +484,8 @@ char SCA_JoystickSensor::NumberOfAxes_doc[] =
"\tReturns the number of axes .\n"; "\tReturns the number of axes .\n";
PyObject* SCA_JoystickSensor::PyNumberOfAxes( PyObject* self ) { PyObject* SCA_JoystickSensor::PyNumberOfAxes( PyObject* self ) {
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex); SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
if(joy) // when the joystick is null their is 0 exis still. dumb but scripters should use isConnected()
return PyInt_FromLong( joy->GetNumberOfAxes() ); return PyInt_FromLong( joy ? joy->GetNumberOfAxes() : 0 );
return false;
} }
@ -494,9 +494,7 @@ char SCA_JoystickSensor::NumberOfButtons_doc[] =
"\tReturns the number of buttons .\n"; "\tReturns the number of buttons .\n";
PyObject* SCA_JoystickSensor::PyNumberOfButtons( PyObject* self ) { PyObject* SCA_JoystickSensor::PyNumberOfButtons( PyObject* self ) {
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex); SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
if(joy) return PyInt_FromLong( joy ? joy->GetNumberOfButtons() : 0 );
return PyInt_FromLong( joy->GetNumberOfButtons() );
return false;
} }
@ -505,9 +503,7 @@ char SCA_JoystickSensor::NumberOfHats_doc[] =
"\tReturns the number of hats .\n"; "\tReturns the number of hats .\n";
PyObject* SCA_JoystickSensor::PyNumberOfHats( PyObject* self ) { PyObject* SCA_JoystickSensor::PyNumberOfHats( PyObject* self ) {
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex); SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
if(joy) return PyInt_FromLong( joy ? joy->GetNumberOfHats() : 0 );
return PyInt_FromLong( joy->GetNumberOfHats() );
return false;
} }
char SCA_JoystickSensor::Connected_doc[] = char SCA_JoystickSensor::Connected_doc[] =
@ -515,7 +511,5 @@ char SCA_JoystickSensor::Connected_doc[] =
"\tReturns True if a joystick is connected at this joysticks index.\n"; "\tReturns True if a joystick is connected at this joysticks index.\n";
PyObject* SCA_JoystickSensor::PyConnected( PyObject* self ) { PyObject* SCA_JoystickSensor::PyConnected( PyObject* self ) {
SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex); SCA_Joystick *joy = m_pJoystickMgr->GetJoystickDevice(m_joyindex);
if(joy) return PyBool_FromLong( joy ? joy->Connected() : 0 );
return PyBool_FromLong( joy->Connected() );
return false;
} }