This is an automated email from the git hooks/post-receive script. wrar-guest pushed a commit to branch master in repository xboxdrv.
commit 49c9105847c2985ac1fde5710d04a29e9084ef15 Author: Ingo Ruhnke <[email protected]> Date: Thu May 7 09:54:23 2015 +0200 Fixed axis handling in FourWayRestrictorModifier --- src/modifier/four_way_restrictor_modifier.cpp | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/src/modifier/four_way_restrictor_modifier.cpp b/src/modifier/four_way_restrictor_modifier.cpp index b1e33b8..4f1595f 100644 --- a/src/modifier/four_way_restrictor_modifier.cpp +++ b/src/modifier/four_way_restrictor_modifier.cpp @@ -44,32 +44,17 @@ FourWayRestrictorModifier::FourWayRestrictorModifier(XboxAxis xaxis, XboxAxis ya void FourWayRestrictorModifier::update(int msec_delta, XboxGenericMsg& msg) { - // left Stick - if (abs(get_axis(msg, XBOX_AXIS_X1)) > abs(get_axis(msg, XBOX_AXIS_Y1))) + if (abs(get_axis(msg, m_xaxis)) > abs(get_axis(msg, m_yaxis))) { - set_axis(msg, XBOX_AXIS_Y1, 0); + set_axis(msg, m_yaxis, 0); } - else if (abs(get_axis(msg, XBOX_AXIS_Y1)) > abs(get_axis(msg, XBOX_AXIS_X1))) + else if (abs(get_axis(msg, m_yaxis)) > abs(get_axis(msg, m_xaxis))) { - set_axis(msg, XBOX_AXIS_X1, 0); + set_axis(msg, m_xaxis, 0); } else { - set_axis(msg, XBOX_AXIS_X1, 0); - } - - // right stick - if (abs(get_axis(msg, XBOX_AXIS_X2)) > abs(get_axis(msg, XBOX_AXIS_Y2))) - { - set_axis(msg, XBOX_AXIS_Y2, 0); - } - else if (abs(get_axis(msg, XBOX_AXIS_Y2)) > abs(get_axis(msg, XBOX_AXIS_X2))) - { - set_axis(msg, XBOX_AXIS_X2, 0); - } - else - { - set_axis(msg, XBOX_AXIS_X2, 0); + set_axis(msg, m_xaxis, 0); } } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/xboxdrv.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
