mirror of
https://github.com/id-Software/DOOM-3-BFG.git
synced 2025-03-13 22:22:05 +00:00
Merge remote-tracking branch 'Saunders/sdl-joystick'
This commit is contained in:
commit
573933fe19
1 changed files with 1 additions and 2 deletions
|
@ -1348,13 +1348,12 @@ sysEvent_t Sys_GetEvent()
|
|||
{K_JOY_DPAD_LEFT, J_DPAD_LEFT},
|
||||
{K_JOY_DPAD_RIGHT, J_DPAD_RIGHT},
|
||||
};
|
||||
joystick_polls.Append( joystick_poll_t( controllerButtonRemap[ev.cbutton.button][1], ev.cbutton.state == SDL_PRESSED ? 1 : 0 ) );
|
||||
|
||||
res.evType = SE_KEY;
|
||||
res.evValue = controllerButtonRemap[ev.cbutton.button][0];
|
||||
res.evValue2 = ev.cbutton.state == SDL_PRESSED ? 1 : 0;
|
||||
|
||||
joystick_polls.Append( joystick_poll_t( res.evValue, res.evValue2 ) );
|
||||
joystick_polls.Append( joystick_poll_t( controllerButtonRemap[ev.cbutton.button][1], res.evValue2 ) );
|
||||
return res;
|
||||
#else
|
||||
// WM0110
|
||||
|
|
Loading…
Reference in a new issue