[dinput] follow-up patch: remove redundant struct members

[Christoph Frick]

This one applied on top of the 9 patches from yesterday.

License: LGPL
ChangeLog:
2006-07-05  Christoph Frick <rid at zefix.tv>
	only use has_ff and num_effects from the JoyDev

 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);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 163 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20060707/9ad0d823/attachment.pgp