mirror of
https://github.com/reactos/wine.git
synced 2024-12-14 15:19:28 +00:00
dinput: Use the correct index to remap the axis.
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
b5159c6a2d
commit
299a6ce5bb
@ -291,6 +291,11 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
|
||||
case (DWORD_PTR)DIPROP_RANGE: {
|
||||
LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph;
|
||||
if (ph->dwHow == DIPH_DEVICE) {
|
||||
|
||||
/* Many games poll the joystick immediately after setting the range
|
||||
* for calibration purposes, so the old values need to be remapped
|
||||
* to the new range before it does so */
|
||||
|
||||
TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax);
|
||||
for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) {
|
||||
|
||||
@ -324,8 +329,6 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
|
||||
TRACE("proprange(%d,%d) obj=%d\n", pr->lMin, pr->lMax, obj);
|
||||
if (obj >= 0) {
|
||||
|
||||
/*ePSXe polls the joystick immediately after setting the range for calibration purposes, so the old values need to be remapped to the new range before it does so*/
|
||||
|
||||
remap_props.lDevMin = This->props[obj].lMin;
|
||||
remap_props.lDevMax = This->props[obj].lMax;
|
||||
|
||||
@ -335,7 +338,7 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF
|
||||
remap_props.lMin = pr->lMin;
|
||||
remap_props.lMax = pr->lMax;
|
||||
|
||||
switch (ph->dwObj) {
|
||||
switch (This->base.data_format.wine_df->rgodf[obj].dwOfs) {
|
||||
case DIJOFS_X : This->js.lX = joystick_map_axis(&remap_props, This->js.lX); break;
|
||||
case DIJOFS_Y : This->js.lY = joystick_map_axis(&remap_props, This->js.lY); break;
|
||||
case DIJOFS_Z : This->js.lZ = joystick_map_axis(&remap_props, This->js.lZ); break;
|
||||
|
Loading…
Reference in New Issue
Block a user