Christoph Frick : dinput: Remove redundant struct members.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 97fed19afc1aef22c8fe4c881f53937b7c31cbc4
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=97fed19afc1aef22c8fe4c88...

Author: Christoph Frick 
Date:   Fri Jul  7 10:00:01 2006 +0200

dinput: Remove redundant struct members.

---

dlls/dinput/joystick_linuxinput.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 9304171..727fac1 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -145,8 +145,6 @@ struct JoystickImpl
    DIJOYSTATE2			js;

/* Force feedback variables */
-	BOOL				has_ff;
-	int				num_effects;
    EffectListItem*			top_effect;
    int				ff_state;
 };
@@ -1230,7 +1228,7 @@ static HRESULT WINAPI JoystickAImpl_GetC
       }
     }

-    if (This->has_ff) 
+    if (This->joydev->has_ff) 
     lpDIDevCaps->dwFlags |= DIDC_FORCEFEEDBACK;

lpDIDevCaps->dwAxes = axes;
@@ -1332,7 +1330,7 @@ static HRESULT WINAPI JoystickAImpl_Enum
       ddoi.dwOfs =  This->df->rgodf[user_object].dwOfs;
       /* Linux event force feedback supports only (and always) x and y axes */
       if (i == ABS_X || i == ABS_Y) {
-	if (This->has_ff)
+	if (This->joydev->has_ff)
      ddoi.dwFlags |= DIDOI_FFACTUATOR;
       }
       sprintf(ddoi.tszName, "%d-Axis", i);