X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_joystick.c;h=b6fcdbce42dd303805768cd8889990cd09a346e5;hb=09070646b28804f0a700bd10b6caf8d606712d2c;hp=7548a88efffa90d6fa118c71ca4ffee5b5c155da;hpb=2586d5c2ebd7cc9c788c8f68d2f2e8871f5438f5;p=freeglut diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c index 7548a88..b6fcdbc 100644 --- a/src/freeglut_joystick.c +++ b/src/freeglut_joystick.c @@ -1581,15 +1581,14 @@ static void fghJoystickInit( int ident ) */ void fgInitialiseJoysticks ( void ) { - /* Initialization courtesy of OpenGLUT -- do we want it? */ - if( !fgState.JoysticksInitialised ) - { - int ident ; - for ( ident = 0; ident < MAX_NUM_JOYSTICKS; ident++ ) - fghJoystickInit( ident ); + if( !fgState.JoysticksInitialised ) + { + int ident ; + for ( ident = 0; ident < MAX_NUM_JOYSTICKS; ident++ ) + fghJoystickInit( ident ); - fgState.JoysticksInitialised = GL_TRUE; - } + fgState.JoysticksInitialised = GL_TRUE; + } } /* @@ -1680,21 +1679,21 @@ void fgJoystickPollWindow( SFG_Window* window ) */ int fgJoystickDetect( void ) { - int ident; + int ident; - fgInitialiseJoysticks (); + fgInitialiseJoysticks (); - if ( !fgJoystick ) - return 0; + if ( !fgJoystick ) + return 0; - if ( !fgState.JoysticksInitialised ) - return 0; + if ( !fgState.JoysticksInitialised ) + return 0; - for( ident=0; identerror ) - return 1; + for( ident=0; identerror ) + return 1; - return 0; + return 0; } /*