changeset 2109:51cbe188a49e

Merged r3029:3030 from branches/SDL-1.2: Mac OS X joystick axis fix.
author Ryan C. Gordon <icculus@icculus.org>
date Tue, 29 May 2007 12:14:16 +0000
parents a930c8e4d8b0
children 21942f552734
files src/joystick/darwin/SDL_sysjoystick.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/joystick/darwin/SDL_sysjoystick.c	Sun May 27 08:54:38 2007 +0000
+++ b/src/joystick/darwin/SDL_sysjoystick.c	Tue May 29 12:14:16 2007 +0000
@@ -258,12 +258,11 @@
         pElement->cookie = (IOHIDElementCookie) number;
     refType = CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementMinKey));
     if (refType && CFNumberGetValue(refType, kCFNumberLongType, &number))
-        pElement->min = number;
+        pElement->minReport = pElement->min = number;
     pElement->maxReport = pElement->min;
     refType = CFDictionaryGetValue(refElement, CFSTR(kIOHIDElementMaxKey));
     if (refType && CFNumberGetValue(refType, kCFNumberLongType, &number))
-        pElement->max = number;
-    pElement->minReport = pElement->max;
+        pElement->maxReport = pElement->max = number;
 /*
 	TODO: maybe should handle the following stuff somehow?