diff options
| author | Fedja Beader <fedja@protonmail.ch> | 2024-05-15 19:42:10 +0000 |
|---|---|---|
| committer | Fedja Beader <fedja@protonmail.ch> | 2024-05-15 19:42:10 +0000 |
| commit | 99f361699e1c8bbc1e69f4d199863b836b3528a3 (patch) | |
| tree | a0223df3b3a8ce2d7adfa270f45a25f930309d42 /src/gui/sdlinput.cpp | |
| parent | 4337008fdeef5bb01be2fc6fed1683d5941f23ae (diff) | |
| parent | ce7efa33a54fdf37416631057dc13799dc2f847f (diff) | |
| download | manaplus-99f361699e1c8bbc1e69f4d199863b836b3528a3.tar.gz manaplus-99f361699e1c8bbc1e69f4d199863b836b3528a3.tar.bz2 manaplus-99f361699e1c8bbc1e69f4d199863b836b3528a3.tar.xz manaplus-99f361699e1c8bbc1e69f4d199863b836b3528a3.zip | |
Merge branch 'improved_controller' into 'master'
Controller improvements
See merge request mana/plus!52
Diffstat (limited to 'src/gui/sdlinput.cpp')
| -rw-r--r-- | src/gui/sdlinput.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index 9b8b1ec6a..8f3ca8bff 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -171,6 +171,22 @@ void SDLInput::pushInput(const SDL_Event &event) break; } + case SDL_JOYBUTTONDOWN: + case SDL_JOYHATMOTION: + case SDL_JOYAXISMOTION: + { + const InputActionT actionId = inputManager.getActionByKey(event); + if (actionId > InputAction::NO_VALUE) + { + keyInput.setActionId(actionId); + keyInput.setType(KeyEventType::PRESSED); + mKeyInputQueue.push(keyInput); + keyInput.setType(KeyEventType::RELEASED); + mKeyInputQueue.push(keyInput); + } + break; + } + #ifdef USE_SDL2 case SDL_TEXTINPUT: keyInput.setType(KeyEventType::PRESSED); |