kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

joystick connection accounting fix

Browse Source 
Tested with 3 simultaneous joypads and deconnection+reconnection scenario. Thanks to Alan McCosh for pointing this out.
This commit is contained in:
Nilsen Filc
2015-03-18 18:20:18 +01:00
parent 6d38da6318
commit 218f3e5d5f
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
legacy/project/src/sdl2/SDL2Stage.cpp
View File

@@ -1360,9 +1360,9 @@ void ProcessEvent(SDL_Event &inEvent)
int joyId = -1;
for (int i = 0; i < sgJoysticksId.size(); i++)
{
if (sgJoysticksIndex[i] == i)
if (sgJoysticksIndex[i] == inEvent.jdevice.which)
{
joyId = i;
joyId = inEvent.jdevice.which;
break;
}
}
@@ -1592,20 +1592,9 @@ void CreateMainFrame(FrameCreationCallback inOnFrame, int inWidth, int inHeight,
sgSDLFrame = new SDLFrame(window, renderer, windowFlags, opengl, width, height);
inOnFrame(sgSDLFrame);
int numJoysticks = SDL_NumJoysticks();
if (sgJoystickEnabled && numJoysticks > 0) {
SDL_JoystickEventState(SDL_TRUE);
for (int i = 0; i < numJoysticks; i++) {
sgJoystick = SDL_JoystickOpen(i);
Event joystick(etJoyDeviceAdded);
joystick.id = SDL_JoystickInstanceID(sgJoystick);
sgJoysticks.push_back(sgJoystick);
sgJoysticksId.push_back(joystick.id);
sgJoysticksIndex.push_back(i);
sgSDLFrame->ProcessEvent(joystick);
}
}
SDL_JoystickEventState(SDL_TRUE);
StartAnimation();
}