# HG changeset patch # User Ryan C. Gordon # Date 1180440856 0 # Node ID 51cbe188a49e2c8aa765503e22386d325f460f6c # Parent a930c8e4d8b040d96c21612a9c7a8d606c987f46 Merged r3029:3030 from branches/SDL-1.2: Mac OS X joystick axis fix. diff -r a930c8e4d8b0 -r 51cbe188a49e src/joystick/darwin/SDL_sysjoystick.c --- 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?