Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-24 11:52:14 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-24 11:52:14 +0400
commitb8a71efeba70d6c3ebc579f5043daa4162da86e8 (patch)
treed2d89da2a59f8955583f4968a35e48c578fd4d4c /source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
parent81d8f17843f92c6d6abbacb652ca22917910f4bc (diff)
style cleanup: follow style guide for/with/if spacing
Diffstat (limited to 'source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp')
-rw-r--r--source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
index b22246014bf..38416a340c7 100644
--- a/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
+++ b/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
@@ -51,10 +51,10 @@ SCA_Joystick::SCA_Joystick(short int index)
m_istrig_button(0),
m_istrig_hat(0)
{
- for(int i=0; i<JOYAXIS_MAX; i++)
+ for (int i=0; i<JOYAXIS_MAX; i++)
m_axis_array[i]= 0;
- for(int i=0; i<JOYHAT_MAX; i++)
+ for (int i=0; i<JOYHAT_MAX; i++)
m_hat_array[i]= 0;
#ifdef WITH_SDL
@@ -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)");
@@ -264,9 +264,9 @@ bool SCA_Joystick::CreateJoystickDevice(void)
else if (m_axismax < 0) m_axismax = 0;
if (m_hatmax > JOYHAT_MAX) m_hatmax= JOYHAT_MAX; /* very unlikely */
- else if(m_hatmax<0) m_hatmax= 0;
+ else if (m_hatmax<0) m_hatmax= 0;
- if(m_buttonmax<0) m_buttonmax= 0;
+ if (m_buttonmax<0) m_buttonmax= 0;
}
return true;
@@ -278,7 +278,7 @@ void SCA_Joystick::DestroyJoystickDevice(void)
{
#ifdef WITH_SDL
if (m_isinit){
- if(SDL_JoystickOpened(m_joyindex)){
+ if (SDL_JoystickOpened(m_joyindex)){
echo("Closing-joystick " << m_joyindex);
SDL_JoystickClose(m_private->m_joystick);
}