diff options
author | ewewukek <ewewukek@gmail.com> | 2024-01-10 23:26:42 +0300 |
---|---|---|
committer | Fedja Beader <fedja@protonmail.ch> | 2024-05-14 01:14:04 +0000 |
commit | 84a11a02aad86d9388175c7fd0971accdb586473 (patch) | |
tree | 2074498193d24700a002319a0c4b412752809f43 /src/input/joystick.cpp | |
parent | e0f535979ad9315efbe4a16ab1ad345d9e9a4347 (diff) | |
download | manaplus-84a11a02aad86d9388175c7fd0971accdb586473.tar.gz manaplus-84a11a02aad86d9388175c7fd0971accdb586473.tar.bz2 manaplus-84a11a02aad86d9388175c7fd0971accdb586473.tar.xz manaplus-84a11a02aad86d9388175c7fd0971accdb586473.zip |
Switch joystick axis tolerance type to float
Diffstat (limited to 'src/input/joystick.cpp')
-rw-r--r-- | src/input/joystick.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/input/joystick.cpp b/src/input/joystick.cpp index 4bcb070d3..0ab6102c5 100644 --- a/src/input/joystick.cpp +++ b/src/input/joystick.cpp @@ -195,9 +195,9 @@ bool Joystick::open() mButtonsNumber = MAX_BUTTONS; #ifdef __SWITCH__ - config.setValue("joystickTolerance", 10000); + config.setValue("joystickTolerance", 0.1F); #endif - mTolerance = config.getIntValue("joystickTolerance"); + mTolerance = config.getFloatValue("joystickTolerance"); mUseInactive = config.getBoolValue("useInactiveJoystick"); return true; @@ -243,16 +243,16 @@ void Joystick::logic() { // X-Axis int position = SDL_JoystickGetAxis(mJoystick, 0); - if (position >= mTolerance) + if (position >= mTolerance * SDL_JOYSTICK_AXIS_MAX) mDirection |= RIGHT; - else if (position <= -mTolerance) + else if (position <= mTolerance * SDL_JOYSTICK_AXIS_MIN) mDirection |= LEFT; // Y-Axis position = SDL_JoystickGetAxis(mJoystick, 1); - if (position <= -mTolerance) + if (position <= mTolerance * SDL_JOYSTICK_AXIS_MIN) mDirection |= UP; - else if (position >= mTolerance) + else if (position >= mTolerance * SDL_JOYSTICK_AXIS_MAX) mDirection |= DOWN; #ifdef DEBUG_JOYSTICK |