diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-28 09:03:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-28 09:03:24 +0400 |
| commit | 07065b27b8b37316004f40896f436d26e066f25f (patch) | |
| tree | 19713fa864612e094f21a881e9816a8e1bf42b7b /source/gameengine/GameLogic/Joystick | |
| parent | c9f677d24d9600d9ba07f1b258c49455bc348554 (diff) | |
style cleanup
Diffstat (limited to 'source/gameengine/GameLogic/Joystick')
| -rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp | 10 | ||||
| -rw-r--r-- | source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp index 38416a340c7..46ebd0ecc4f 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp @@ -92,9 +92,9 @@ SCA_Joystick *SCA_Joystick::GetInstance( short int joyindex ) // when GHOST is running under SDL, video is initialized elsewhere. // Do this once only. # ifdef WITH_GHOST_SDL - if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1 ){ + if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1 ) { # else - if (SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO) == -1 ){ + if (SDL_InitSubSystem(SDL_INIT_JOYSTICK | SDL_INIT_VIDEO) == -1 ) { # endif echo("Error-Initializing-SDL: " << SDL_GetError()); return NULL; @@ -239,7 +239,7 @@ bool SCA_Joystick::CreateJoystickDevice(void) m_axismax = m_buttonmax = m_hatmax = 0; return false; #else /* WITH_SDL */ - if (m_isinit == false){ + if (m_isinit == false) { if (m_joyindex>=m_joynum) { // don't print a message, because this is done anyway //echo("Joystick-Error: " << SDL_NumJoysticks() << " avaiable joystick(s)"); @@ -277,8 +277,8 @@ bool SCA_Joystick::CreateJoystickDevice(void) void SCA_Joystick::DestroyJoystickDevice(void) { #ifdef WITH_SDL - if (m_isinit){ - if (SDL_JoystickOpened(m_joyindex)){ + if (m_isinit) { + if (SDL_JoystickOpened(m_joyindex)) { echo("Closing-joystick " << m_joyindex); SDL_JoystickClose(m_private->m_joystick); } diff --git a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp index 44b6cfd7d35..efe76c3eb46 100644 --- a/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp +++ b/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp @@ -66,7 +66,7 @@ void SCA_Joystick::OnButtonUp(SDL_Event* sdl_event) void SCA_Joystick::OnButtonDown(SDL_Event* sdl_event) { - //if(sdl_event->jbutton.button > m_buttonmax) /* unsigned int so always above 0 */ + //if (sdl_event->jbutton.button > m_buttonmax) /* unsigned int so always above 0 */ // return; // sdl_event->jbutton.button; |