X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=freeglut-1.3%2Ffreeglut_joystick.c;h=7ac4c3d50c271e584d31071acb9cdefcc2f0d8f3;hb=4ac1ea787d86ca1e4faf1c86df89df3264d2023d;hp=fc2c8f63fd31409c756fe13bb29dae71601140fe;hpb=583baa8756a71ed088b8e46c52a945218037314c;p=freeglut diff --git a/freeglut-1.3/freeglut_joystick.c b/freeglut-1.3/freeglut_joystick.c index fc2c8f6..7ac4c3d 100644 --- a/freeglut-1.3/freeglut_joystick.c +++ b/freeglut-1.3/freeglut_joystick.c @@ -413,7 +413,7 @@ static void fghJoystickOpen( SFG_Joystick* joy ) if( joy->error ) return ; - sprintf( joyfname, "%s/.joy%drc", g_getenv( "HOME" ), id ); + sprintf( joyfname, "%s/.joy%drc", g_getenv( "HOME" ), joy->id ); joyfile = fopen( joyfname, "r" ); joy->error = (joyfile == NULL); @@ -434,8 +434,8 @@ static void fghJoystickOpen( SFG_Joystick* joy ) for( i=0 ; i<_JS_MAX_AXES ; i++ ) { - dead_band[ i ] = 0.0f; - saturate [ i ] = 1.0f; + joy->dead_band[ i ] = 0.0f; + joy->saturate [ i ] = 1.0f; } # else