summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/input_common/sdl/sdl_impl.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp
index ddb88cc38..e03f9b712 100644
--- a/src/input_common/sdl/sdl_impl.cpp
+++ b/src/input_common/sdl/sdl_impl.cpp
@@ -611,8 +611,8 @@ public:
611 SDLPoller::Start(); 611 SDLPoller::Start();
612 612
613 // Reset stored axes 613 // Reset stored axes
614 analog_xaxis = -1; 614 analog_x_axis = -1;
615 analog_yaxis = -1; 615 analog_y_axis = -1;
616 analog_axes_joystick = -1; 616 analog_axes_joystick = -1;
617 } 617 }
618 618
@@ -625,24 +625,24 @@ public:
625 // An analog device needs two axes, so we need to store the axis for later and wait for 625 // An analog device needs two axes, so we need to store the axis for later and wait for
626 // a second SDL event. The axes also must be from the same joystick. 626 // a second SDL event. The axes also must be from the same joystick.
627 const int axis = event.jaxis.axis; 627 const int axis = event.jaxis.axis;
628 if (analog_xaxis == -1) { 628 if (analog_x_axis == -1) {
629 analog_xaxis = axis; 629 analog_x_axis = axis;
630 analog_axes_joystick = event.jaxis.which; 630 analog_axes_joystick = event.jaxis.which;
631 } else if (analog_yaxis == -1 && analog_xaxis != axis && 631 } else if (analog_y_axis == -1 && analog_x_axis != axis &&
632 analog_axes_joystick == event.jaxis.which) { 632 analog_axes_joystick == event.jaxis.which) {
633 analog_yaxis = axis; 633 analog_y_axis = axis;
634 } 634 }
635 } 635 }
636 Common::ParamPackage params; 636 Common::ParamPackage params;
637 if (analog_xaxis != -1 && analog_yaxis != -1) { 637 if (analog_x_axis != -1 && analog_y_axis != -1) {
638 const auto joystick = state.GetSDLJoystickBySDLID(event.jaxis.which); 638 const auto joystick = state.GetSDLJoystickBySDLID(event.jaxis.which);
639 params.Set("engine", "sdl"); 639 params.Set("engine", "sdl");
640 params.Set("port", joystick->GetPort()); 640 params.Set("port", joystick->GetPort());
641 params.Set("guid", joystick->GetGUID()); 641 params.Set("guid", joystick->GetGUID());
642 params.Set("axis_x", analog_xaxis); 642 params.Set("axis_x", analog_x_axis);
643 params.Set("axis_y", analog_yaxis); 643 params.Set("axis_y", analog_y_axis);
644 analog_xaxis = -1; 644 analog_x_axis = -1;
645 analog_yaxis = -1; 645 analog_y_axis = -1;
646 analog_axes_joystick = -1; 646 analog_axes_joystick = -1;
647 return params; 647 return params;
648 } 648 }
@@ -650,8 +650,8 @@ public:
650 } 650 }
651 651
652private: 652private:
653 int analog_xaxis = -1; 653 int analog_x_axis = -1;
654 int analog_yaxis = -1; 654 int analog_y_axis = -1;
655 SDL_JoystickID analog_axes_joystick = -1; 655 SDL_JoystickID analog_axes_joystick = -1;
656}; 656};
657} // namespace Polling 657} // namespace Polling