mirror of
https://github.com/id-Software/DOOM-3-BFG.git
synced 2025-03-13 22:22:05 +00:00
Fixed merge conflicts
This commit is contained in:
parent
2997fe9f02
commit
af4480f35c
1 changed files with 0 additions and 2 deletions
|
@ -703,8 +703,6 @@ sysEvent_t Sys_GetEvent()
|
|||
case SDL_JOYDEVICEADDED:
|
||||
case SDL_JOYDEVICEREMOVED:
|
||||
case SDL_JOYBATTERYUPDATED:
|
||||
case SDL_CONTROLLERDEVICEADDED:
|
||||
case SDL_CONTROLLERDEVICEREMOVED:
|
||||
// Avoid 'unknown event' spam
|
||||
continue;
|
||||
|
||||
|
|
Loading…
Reference in a new issue