Mercurial > sdl-ios-xcode
comparison src/joystick/win32/SDL_mmjoystick.c @ 165:6a4e09bbbbc0
Joystick initialization fix submitted by Vitaliy Mikitchenko
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Tue, 04 Sep 2001 22:38:01 +0000 |
parents | 6f3c474f9abd |
children | e8157fcb3114 |
comparison
equal
deleted
inserted
replaced
164:7434cc45d484 | 165:6a4e09bbbbc0 |
---|---|
83 JOYCAPS joycaps; | 83 JOYCAPS joycaps; |
84 MMRESULT result; | 84 MMRESULT result; |
85 | 85 |
86 numdevs = 0; | 86 numdevs = 0; |
87 maxdevs = joyGetNumDevs(); | 87 maxdevs = joyGetNumDevs(); |
88 | |
88 if ( maxdevs > MAX_JOYSTICKS ) { | 89 if ( maxdevs > MAX_JOYSTICKS ) { |
89 maxdevs = MAX_JOYSTICKS; | 90 maxdevs = MAX_JOYSTICKS; |
90 } | 91 } |
91 | 92 |
93 | |
92 SYS_JoystickID[0] = JOYSTICKID1; | 94 SYS_JoystickID[0] = JOYSTICKID1; |
93 SYS_JoystickID[1] = JOYSTICKID2; | 95 SYS_JoystickID[1] = JOYSTICKID2; |
94 | 96 |
95 for ( i = 0; (i < maxdevs); ++i ) { | 97 for ( i = 0; (i < maxdevs); ++i ) { |
98 | |
99 /* added 8/31/2001 By Vitaliy Mikitchenko */ | |
100 joyinfo.dwSize = sizeof(joyinfo); | |
101 joyinfo.dwFlags = JOY_RETURNALL; | |
102 /* end addition */ | |
103 | |
96 result = joyGetPosEx(SYS_JoystickID[i], &joyinfo); | 104 result = joyGetPosEx(SYS_JoystickID[i], &joyinfo); |
97 if ( result == JOYERR_NOERROR ) { | 105 if ( result == JOYERR_NOERROR ) { |
98 result = joyGetDevCaps(SYS_JoystickID[i], &joycaps, sizeof(joycaps)); | 106 result = joyGetDevCaps(SYS_JoystickID[i], &joycaps, sizeof(joycaps)); |
99 if ( result == JOYERR_NOERROR ) { | 107 if ( result == JOYERR_NOERROR ) { |
100 SYS_JoystickID[numdevs] = SYS_JoystickID[i]; | 108 SYS_JoystickID[numdevs] = SYS_JoystickID[i]; |