Fixed bug #478

Take the min and max values into account.
libsdl-org · Dec 29, 2007 · b48f3e1 · b48f3e1
1 parent 73cfb17
commit b48f3e1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
@@ -770,7 +770,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
 {
     recDevice *device = joystick->hwdata;
     recElement *element;
-    SInt32 value;
+    SInt32 value, range;
     int i;
 
     if (device->removed) {      /* device was unplugged; ignore it. */
@@ -818,10 +818,11 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
     while (element) {
         Uint8 pos = 0;
 
-        value = HIDGetElementValue(device, element);
-        if (element->max == 3)  /* 4 position hatswitch - scale up value */
+        range = (element->max - element->min + 1);
+        value = HIDGetElementValue(device, element) - element->min;
+        if (range == 4)  /* 4 position hatswitch - scale up value */
             value *= 2;
-        else if (element->max != 7)     /* Neither a 4 nor 8 positions - fall back to default position (centered) */
+        else if (range != 8)     /* Neither a 4 nor 8 positions - fall back to default position (centered) */
             value = -1;
         switch (value) {
         case 0: