pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Joystick initialization fix submitted by Vitaliy Mikitchenko

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40166
This commit is contained in:
Sam Lantinga 2001-09-04 22:38:01 +00:00
parent 38014ea6ce
commit b29480bdb9
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/joystick/win32/SDL_mmjoystick.c
View file

@ -85,14 +85,22 @@ int SDL_SYS_JoystickInit(void)
numdevs = 0; numdevs = 0;
maxdevs = joyGetNumDevs(); maxdevs = joyGetNumDevs();
if ( maxdevs > MAX_JOYSTICKS ) { if ( maxdevs > MAX_JOYSTICKS ) {
maxdevs = MAX_JOYSTICKS; maxdevs = MAX_JOYSTICKS;
} }
SYS_JoystickID[0] = JOYSTICKID1; SYS_JoystickID[0] = JOYSTICKID1;
SYS_JoystickID[1] = JOYSTICKID2; SYS_JoystickID[1] = JOYSTICKID2;
for ( i = 0; (i < maxdevs); ++i ) { for ( i = 0; (i < maxdevs); ++i ) {
/* added 8/31/2001 By Vitaliy Mikitchenko */
joyinfo.dwSize = sizeof(joyinfo);
joyinfo.dwFlags = JOY_RETURNALL;
/* end addition */
result = joyGetPosEx(SYS_JoystickID[i], &joyinfo); result = joyGetPosEx(SYS_JoystickID[i], &joyinfo);
if ( result == JOYERR_NOERROR ) { if ( result == JOYERR_NOERROR ) {
result = joyGetDevCaps(SYS_JoystickID[i], &joycaps, sizeof(joycaps)); result = joyGetDevCaps(SYS_JoystickID[i], &joycaps, sizeof(joycaps));