Revert "Update DinputDevice.cpp"

This reverts commit 99ede3fbbb.
This commit is contained in:
Henrik Rydgård committed 2013-06-29 18:12:48 +02:00
1 parent 536a88191c
commit 0d0e1db1b9
1 file changed
+19 -19
+19 -19
View File
@@ -35,10 +35,10 @@
unsigned int dinput_ctrl_map[] = {
11, PAD_BUTTON_MENU, // Open PauseScreen
10, PAD_BUTTON_BACK, // Toggle PauseScreen & Back Setting Page
2, PAD_BUTTON_A, // Cross = XBOX-A
1, PAD_BUTTON_B, // Circle = XBOX-B
3, PAD_BUTTON_X, // Square = XBOX-X
0, PAD_BUTTON_Y, // Triangle = XBOX-Y
1, PAD_BUTTON_A, // Cross = XBOX-A
2, PAD_BUTTON_B, // Circle = XBOX-B
0, PAD_BUTTON_X, // Square = XBOX-X
3, PAD_BUTTON_Y, // Triangle = XBOX-Y
8, PAD_BUTTON_SELECT,
9, PAD_BUTTON_START,
4, PAD_BUTTON_LBUMPER, // LTrigger = XBOX-LBumper
@@ -216,26 +216,26 @@ int DinputDevice::UpdateState(InputState &input_state)
case 0:
break;
case 1:
if (js.lRz > rthreshold) input_state.pad_buttons |= PAD_BUTTON_DOWN;
else if (js.lRz < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_UP;
if (js.lZ > rthreshold) input_state.pad_buttons |= PAD_BUTTON_RIGHT;
else if (js.lZ < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_LEFT;
if (js.lRz > rthreshold) input_state.pad_buttons |= PAD_BUTTON_RIGHT;
else if (js.lRz < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_LEFT;
if (js.lZ > rthreshold) input_state.pad_buttons |= PAD_BUTTON_UP;
else if (js.lZ < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_DOWN;
break;
case 2:
if (js.lRz > rthreshold) input_state.pad_buttons |= PAD_BUTTON_A;
else if (js.lRz < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_Y;
if (js.lZ > rthreshold) input_state.pad_buttons |= PAD_BUTTON_B;
else if (js.lZ < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_X;
if (js.lRz > rthreshold) input_state.pad_buttons |= PAD_BUTTON_B;
else if (js.lRz < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_X;
if (js.lZ > rthreshold) input_state.pad_buttons |= PAD_BUTTON_Y;
else if (js.lZ < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_A;
break;
case 3:
if (js.lZ > rthreshold) input_state.pad_buttons |= PAD_BUTTON_RBUMPER;
else if (js.lZ < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_LBUMPER;
if (js.lRz > rthreshold) input_state.pad_buttons |= PAD_BUTTON_RBUMPER;
else if (js.lRz < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_LBUMPER;
break;
case 4:
if (js.lRz > rthreshold) input_state.pad_buttons |= PAD_BUTTON_A;
else if (js.lRz < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_Y;
if (js.lZ > rthreshold) input_state.pad_buttons |= PAD_BUTTON_RBUMPER;
else if (js.lZ < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_LBUMPER;
if (js.lRz > rthreshold) input_state.pad_buttons |= PAD_BUTTON_RBUMPER;
else if (js.lRz < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_LBUMPER;
if (js.lZ > rthreshold) input_state.pad_buttons |= PAD_BUTTON_Y;
else if (js.lZ < -rthreshold) input_state.pad_buttons |= PAD_BUTTON_A;
break;
}
@@ -272,4 +272,4 @@ int DinputDevice::UpdateRawStateSingle(RawInputState &rawState)
}
}
return FALSE;
}
}