Mercurial > sdl-ios-xcode

comparison src/joystick/win32/SDL_mmjoystick.c @ 2061:6051761b5934

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win32 joystick fix, ported from 1.2 branch r2887:2888. (Thanks, Ondrej!) Fixes Bugzilla #267.
author Ryan C. Gordon <icculus@icculus.org>
date Sun, 29 Oct 2006 03:39:13 +0000
parents c121d94672cb
children cbe06fa842cd
comparison
equal deleted inserted replaced
2060:866052b01ee5 2061:6051761b5934
160 maxdevs = joyGetNumDevs(); 160 maxdevs = joyGetNumDevs();
161 for (i = JOYSTICKID1; i < maxdevs && numdevs < MAX_JOYSTICKS; ++i) { 161 for (i = JOYSTICKID1; i < maxdevs && numdevs < MAX_JOYSTICKS; ++i) {
162 162
163 joyinfo.dwSize = sizeof(joyinfo); 163 joyinfo.dwSize = sizeof(joyinfo);
164 joyinfo.dwFlags = JOY_RETURNALL; 164 joyinfo.dwFlags = JOY_RETURNALL;
165 result = joyGetPosEx(SYS_JoystickID[i], &joyinfo); 165 result = joyGetPosEx(i, &joyinfo);
166 if (result == JOYERR_NOERROR) { 166 if (result == JOYERR_NOERROR) {
167 result = joyGetDevCaps(i, &joycaps, sizeof(joycaps)); 167 result = joyGetDevCaps(i, &joycaps, sizeof(joycaps));
168 if (result == JOYERR_NOERROR) { 168 if (result == JOYERR_NOERROR) {
169 SYS_JoystickID[numdevs] = i; 169 SYS_JoystickID[numdevs] = i;
170 SYS_Joystick[numdevs] = joycaps; 170 SYS_Joystick[numdevs] = joycaps;