From 23356e1483db96c7dc9b6e58e260cd7b24987222 Mon Sep 17 00:00:00 2001
From: Mitch Cairns <[EMAIL REDACTED]>
Date: Mon, 29 Sep 2025 21:53:05 -0700
Subject: [PATCH] SInput: Fix paddle order
For SInput, the paddle order is left/right, which conflicted with the paddle order 1/Right, 2/Left.
The order has been fixed to properly apply the mapping strings generated to be 2/Left, 1/Right, 4/Left, 3/Right.
---
src/joystick/SDL_gamepad.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/joystick/SDL_gamepad.c b/src/joystick/SDL_gamepad.c
index 96d12cc3821d6..c4b7ade14bc87 100644
--- a/src/joystick/SDL_gamepad.c
+++ b/src/joystick/SDL_gamepad.c
@@ -930,8 +930,9 @@ static inline void SDL_SInputStylesMapExtraction(SDL_SInputStyles_t* styles, cha
// Paddle 1/2
if (paddle_pairs > 0) {
- SDL_ADD_BUTTON_MAPPING("paddle1", current_button++, mapping_string_len);
+ // Paddle 2 is first for left/right order of SInput
SDL_ADD_BUTTON_MAPPING("paddle2", current_button++, mapping_string_len);
+ SDL_ADD_BUTTON_MAPPING("paddle1", current_button++, mapping_string_len);
}
// Start/Plus
@@ -960,8 +961,9 @@ static inline void SDL_SInputStylesMapExtraction(SDL_SInputStyles_t* styles, cha
// Paddle 3/4
if (paddle_pairs > 1) {
- SDL_ADD_BUTTON_MAPPING("paddle3", current_button++, mapping_string_len);
+ // Paddle 4 is first for left/right order of SInput
SDL_ADD_BUTTON_MAPPING("paddle4", current_button++, mapping_string_len);
+ SDL_ADD_BUTTON_MAPPING("paddle3", current_button++, mapping_string_len);
}
// Touchpad buttons