summaryrefslogtreecommitdiff
path: root/src/input/joystick.h
diff options
context:
space:
mode:
authorewewukek <ewewukek@gmail.com>2024-01-10 23:26:42 +0300
committerFedja Beader <fedja@protonmail.ch>2024-05-14 01:14:04 +0000
commit84a11a02aad86d9388175c7fd0971accdb586473 (patch)
tree2074498193d24700a002319a0c4b412752809f43 /src/input/joystick.h
parente0f535979ad9315efbe4a16ab1ad345d9e9a4347 (diff)
downloadmv-84a11a02aad86d9388175c7fd0971accdb586473.tar.gz
mv-84a11a02aad86d9388175c7fd0971accdb586473.tar.bz2
mv-84a11a02aad86d9388175c7fd0971accdb586473.tar.xz
mv-84a11a02aad86d9388175c7fd0971accdb586473.zip
Switch joystick axis tolerance type to float
Diffstat (limited to 'src/input/joystick.h')
-rw-r--r--src/input/joystick.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/input/joystick.h b/src/input/joystick.h
index d90420395..32fdddf2e 100644
--- a/src/input/joystick.h
+++ b/src/input/joystick.h
@@ -31,6 +31,15 @@ PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL_events.h>
PRAGMA48(GCC diagnostic pop)
+// defined first in SDL 2.0.6
+// not available on older distros
+#ifndef SDL_JOYSTICK_AXIS_MIN
+#define SDL_JOYSTICK_AXIS_MIN -32768
+#endif
+#ifndef SDL_JOYSTICK_AXIS_MAX
+#define SDL_JOYSTICK_AXIS_MAX 32767
+#endif
+
class Joystick final
{
public:
@@ -115,7 +124,7 @@ class Joystick final
int getNumber() const noexcept2 A_WARN_UNUSED
{ return mNumber; }
- void setTolerance(const int tolerance)
+ void setTolerance(const float tolerance)
{ mTolerance = tolerance; }
void setUseInactive(const bool b)
@@ -144,7 +153,7 @@ class Joystick final
SDL_Joystick *mJoystick;
- int mTolerance;
+ float mTolerance;
int mNumber;
int mButtonsNumber;
bool mUseInactive;