From aa882cdaa84dedc5ad4187f36dca08bb86e67c4e Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Fri, 7 Jul 2023 21:59:47 +0200 Subject: input_common: set `SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS` to 0 This allows to share the mappings between Nintendo and non-Nintendo controllers. Breaks the controller configuration for existing users who are using a Nintendo controller. (Documentation of the hint https://github.com/libsdl-org/SDL/blob/92b3c53c92971e685254fd89f89ce6bde8cea60e/include/SDL_hints.h#L512-L532) --- src/input_common/drivers/sdl_driver.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/input_common/drivers/sdl_driver.h') 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& joystick) const; + /// Returns the default button bindings list + ButtonBindings GetDefaultButtonBinding(const std::shared_ptr& joystick) const; /// Returns the button mappings from a single controller ButtonMapping GetSingleControllerMapping(const std::shared_ptr& joystick, -- cgit v1.2.3