From d24513a9da7084e2ddbc4e509e287168e4c1492b Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Thu, 18 Dec 2025 01:49:02 +0100
Subject: [PATCH] more controller fixes

---
 control.cpp | 12 ++++++------
 multi.cpp   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/control.cpp b/control.cpp
index 93824217..f9d2fdfa 100644
--- a/control.cpp
+++ b/control.cpp
@@ -1344,9 +1344,9 @@ EX void handle_event(SDL_Event& ev) {
           joyx = ev.caxis.value;
         else if(ev.caxis.axis == 1)
           joyy = ev.caxis.value;
-        else if(ev.caxis.axis == 3)
+        else if(ev.caxis.axis == 2)
           panjoyx = ev.caxis.value;
-        else if(ev.caxis.axis == 4)
+        else if(ev.caxis.axis == 3)
           panjoyy = ev.caxis.value;
         checkjoy();
         // printf("panjoy = %d,%d\n", panjoyx, panjoyy);
@@ -1378,10 +1378,10 @@ EX void handle_event(SDL_Event& ev) {
     #if SDLVER >= 2
     else if(ev.type == SDL_CONTROLLERBUTTONDOWN && defaultjoy) {
       sym = uni = PSEUDOKEY_JOY + JOY_ID * gjoy_myid(ev.cbutton.which) + ev.cbutton.button;
-      if(ev.cbutton.which == SDL_CONTROLLER_BUTTON_DPAD_UP) sym = uni = SDLK_UP;
-      if(ev.cbutton.which == SDL_CONTROLLER_BUTTON_DPAD_DOWN) sym = uni = SDLK_DOWN;
-      if(ev.cbutton.which == SDL_CONTROLLER_BUTTON_DPAD_LEFT) sym = uni = SDLK_LEFT;
-      if(ev.cbutton.which == SDL_CONTROLLER_BUTTON_DPAD_RIGHT) sym = uni = SDLK_RIGHT;
+      if(ev.cbutton.button == SDL_CONTROLLER_BUTTON_DPAD_UP) sym = uni = SDLK_UP;
+      if(ev.cbutton.button == SDL_CONTROLLER_BUTTON_DPAD_DOWN) sym = uni = SDLK_DOWN;
+      if(ev.cbutton.button == SDL_CONTROLLER_BUTTON_DPAD_LEFT) sym = uni = SDLK_LEFT;
+      if(ev.cbutton.button == SDL_CONTROLLER_BUTTON_DPAD_RIGHT) sym = uni = SDLK_RIGHT;
       }
     #endif
 #endif
diff --git a/multi.cpp b/multi.cpp
index 446dfae4..b952a5a2 100644
--- a/multi.cpp
+++ b/multi.cpp
@@ -801,8 +801,8 @@ EX void initConfig() {
 
   scfg.axeaction[0][0] = 4;
   scfg.axeaction[0][1] = 5;
-  scfg.axeaction[0][3] = 2;
-  scfg.axeaction[0][4] = 3;
+  scfg.axeaction[0][2] = 2;
+  scfg.axeaction[0][3] = 3;
 
   scfg.axeaction[1][0] = 8;
   scfg.axeaction[1][1] = 9;