Skip to content

W
wine-cw
Commit 97fed19a authored by Christoph Frick's avatar Christoph Frick Committed by Alexandre Julliard
Browse files
Options

dinput: Remove redundant struct members.

parent 3083b0a6
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
dlls/dinput/joystick_linuxinput.c
View file @ 97fed19a
...@@ -145,8 +145,6 @@ struct JoystickImpl ...@@ -145,8 +145,6 @@ struct JoystickImpl
DIJOYSTATE2 js; DIJOYSTATE2 js;
/* Force feedback variables */ /* Force feedback variables */
BOOL has_ff;
int num_effects;
EffectListItem* top_effect; EffectListItem* top_effect;
int ff_state; int ff_state;
}; };
...@@ -1230,7 +1228,7 @@ static HRESULT WINAPI JoystickAImpl_GetCapabilities( ...@@ -1230,7 +1228,7 @@ static HRESULT WINAPI JoystickAImpl_GetCapabilities(
} }
} }
if (This->has_ff) if (This->joydev->has_ff)
lpDIDevCaps->dwFlags |= DIDC_FORCEFEEDBACK; lpDIDevCaps->dwFlags |= DIDC_FORCEFEEDBACK;
lpDIDevCaps->dwAxes = axes; lpDIDevCaps->dwAxes = axes;
...@@ -1332,7 +1330,7 @@ static HRESULT WINAPI JoystickAImpl_EnumObjects( ...@@ -1332,7 +1330,7 @@ static HRESULT WINAPI JoystickAImpl_EnumObjects(
ddoi.dwOfs = This->df->rgodf[user_object].dwOfs; ddoi.dwOfs = This->df->rgodf[user_object].dwOfs;
/* Linux event force feedback supports only (and always) x and y axes */ /* Linux event force feedback supports only (and always) x and y axes */
if (i == ABS_X || i == ABS_Y) { if (i == ABS_X || i == ABS_Y) {
if (This->has_ff) if (This->joydev->has_ff)
ddoi.dwFlags |= DIDOI_FFACTUATOR; ddoi.dwFlags |= DIDOI_FFACTUATOR;
} }
sprintf(ddoi.tszName, "%d-Axis", i); sprintf(ddoi.tszName, "%d-Axis", i);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment