From: Don Heyse <dheyse@hotmail.com>
Date: Thu, 19 Jun 2003 20:17:46 +0000 (+0000)
Subject: Applied tthierry's patch to fix compiling on FreeBSD.
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;ds=sidebyside;h=4ac1ea787d86ca1e4faf1c86df89df3264d2023d;hp=36f83cbf893ad68884edc26c2647b93ea16bf9f3;p=freeglut

Applied tthierry's patch to fix compiling on FreeBSD.


git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@85 7f0cb862-5218-0410-a997-914c9d46530a
---

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