FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Style normalizations to the joystick code.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@349 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
rkrolib 2003-11-15 16:39:46 +00:00
parent 2b78c976ea
commit 1fe1473fbb
1 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
freeglut/freeglut/src/freeglut_joystick.c
View File

@ -533,7 +533,7 @@ static void fghJoystickOpen( SFG_Joystick* joy )
*/ */
void fgJoystickInit( int ident ) void fgJoystickInit( int ident )
{ {
if( fgJoystick != NULL ) if( fgJoystick )
fgError( "illegal attemp to initialize joystick device" ); fgError( "illegal attemp to initialize joystick device" );
fgJoystick = ( SFG_Joystick * )calloc( sizeof( SFG_Joystick ), 1 ); fgJoystick = ( SFG_Joystick * )calloc( sizeof( SFG_Joystick ), 1 );
@ -575,7 +575,7 @@ void fgJoystickInit( int ident )
*/ */
void fgJoystickClose( void ) void fgJoystickClose( void )
{ {
if( fgJoystick == NULL ) if( !fgJoystick )
fgError( "illegal attempt to deinitialize joystick device" ); fgError( "illegal attempt to deinitialize joystick device" );
#ifndef WIN32 #ifndef WIN32
@ -596,7 +596,8 @@ void fgJoystickPollWindow( SFG_Window* window )
float axes[ _JS_MAX_AXES ]; float axes[ _JS_MAX_AXES ];
int buttons; int buttons;
freeglut_return_if_fail( fgJoystick != NULL && window != NULL ); freeglut_return_if_fail( fgJoystick );
freeglut_return_if_fail( window );
freeglut_return_if_fail( FETCH_WCB( *window, Joystick ) ); freeglut_return_if_fail( FETCH_WCB( *window, Joystick ) );
fghJoystickRead( fgJoystick, &buttons, axes ); fghJoystickRead( fgJoystick, &buttons, axes );