diff options
| author | bunnei <bunneidev@gmail.com> | 2023-07-10 18:53:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-10 18:53:16 -0700 |
| commit | 169b198d084b925d3ad7048e939e8d25a83a34b8 (patch) | |
| tree | 149d5c3f02297a2b86baab9ed948a0f4d3f83ca6 /src/input_common/drivers/sdl_driver.h | |
| parent | e32ce6cc6980fd468280f6e8148cfccdb9853990 (diff) | |
| parent | aa882cdaa84dedc5ad4187f36dca08bb86e67c4e (diff) | |
Merge pull request #11050 from SuperSamus/sdl-button-labels
input_common: set `SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS` to 0
Diffstat (limited to 'src/input_common/drivers/sdl_driver.h')
| -rw-r--r-- | src/input_common/drivers/sdl_driver.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/input_common/drivers/sdl_driver.h b/src/input_common/drivers/sdl_driver.h index ffde169b3..fcba4e3c6 100644 --- a/src/input_common/drivers/sdl_driver.h +++ b/src/input_common/drivers/sdl_driver.h @@ -100,11 +100,8 @@ private: int axis_y, float offset_x, float offset_y) const; - /// Returns the default button bindings list for generic controllers - ButtonBindings GetDefaultButtonBinding() const; - - /// Returns the default button bindings list for nintendo controllers - ButtonBindings GetNintendoButtonBinding(const std::shared_ptr<SDLJoystick>& joystick) const; + /// Returns the default button bindings list + ButtonBindings GetDefaultButtonBinding(const std::shared_ptr<SDLJoystick>& joystick) const; /// Returns the button mappings from a single controller ButtonMapping GetSingleControllerMapping(const std::shared_ptr<SDLJoystick>& joystick, |