Kaynağa Gözat

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.
Mitch Cairns 7 ay önce
ebeveyn
işleme
23356e1483
1 değiştirilmiş dosya ile 4 ekleme ve 2 silme
  1. 4 2
      src/joystick/SDL_gamepad.c

+ 4 - 2
src/joystick/SDL_gamepad.c

@@ -930,8 +930,9 @@ static inline void SDL_SInputStylesMapExtraction(SDL_SInputStyles_t* styles, cha
 
 
     // Paddle 1/2
     // Paddle 1/2
     if (paddle_pairs > 0) {
     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("paddle2", current_button++, mapping_string_len);
+        SDL_ADD_BUTTON_MAPPING("paddle1", current_button++, mapping_string_len);
     }
     }
 
 
     // Start/Plus
     // Start/Plus
@@ -960,8 +961,9 @@ static inline void SDL_SInputStylesMapExtraction(SDL_SInputStyles_t* styles, cha
 
 
     // Paddle 3/4
     // Paddle 3/4
     if (paddle_pairs > 1) {
     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("paddle4", current_button++, mapping_string_len);
+        SDL_ADD_BUTTON_MAPPING("paddle3", current_button++, mapping_string_len);
     }
     }
 
 
     // Touchpad buttons
     // Touchpad buttons