From f47b44f4b29d65f3a6f73c15a492fb586a3b9505 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 14 Aug 2019 16:11:55 +0000
Subject: [PATCH] Fix use of wrong macros for game controller buttons in
 game-side input.cpp

git-svn-id: https://svn.eduke32.com/eduke32@8006 1a8010ca-5511-0410-912e-c29ae57300e0
---
 source/duke3d/src/input.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/duke3d/src/input.cpp b/source/duke3d/src/input.cpp
index 73d4e3d19..2199d794c 100644
--- a/source/duke3d/src/input.cpp
+++ b/source/duke3d/src/input.cpp
@@ -63,7 +63,7 @@ int32_t I_AdvanceTrigger(void)
 #if !defined EDUKE32_TOUCH_DEVICES
         || MOUSEINACTIVECONDITIONAL(MOUSE_GetButtons()&LEFT_MOUSE)
 #endif
-        || (JOYSTICK_GetGameControllerButtons()&(1<<SDL_CONTROLLER_BUTTON_A))
+        || (JOYSTICK_GetGameControllerButtons()&(1<<GAMECONTROLLER_BUTTON_A))
 #if defined(GEKKO)
         || MOUSEINACTIVECONDITIONAL(JOYSTICK_GetButtons()&WII_A)
 #endif
@@ -77,7 +77,7 @@ void I_AdvanceTriggerClear(void)
     KB_ClearKeyDown(sc_kpad_Enter);
     KB_ClearKeyDown(sc_Enter);
     MOUSE_ClearButton(LEFT_MOUSE);
-    JOYSTICK_ClearGameControllerButton(1<<SDL_CONTROLLER_BUTTON_A);
+    JOYSTICK_ClearGameControllerButton(1<<GAMECONTROLLER_BUTTON_A);
 #if defined(GEKKO)
     JOYSTICK_ClearButton(WII_A);
 #endif
@@ -88,7 +88,7 @@ int32_t I_ReturnTrigger(void)
     return
         KB_KeyPressed(sc_Escape)
         || (MOUSE_GetButtons()&RIGHT_MOUSE)
-        || (JOYSTICK_GetGameControllerButtons()&(1<<SDL_CONTROLLER_BUTTON_B))
+        || (JOYSTICK_GetGameControllerButtons()&(1<<GAMECONTROLLER_BUTTON_B))
 #if defined(GEKKO)
         || (JOYSTICK_GetButtons()&(WII_B|WII_HOME))
 #endif
@@ -100,7 +100,7 @@ void I_ReturnTriggerClear(void)
     KB_FlushKeyboardQueue();
     KB_ClearKeyDown(sc_Escape);
     MOUSE_ClearButton(RIGHT_MOUSE);
-    JOYSTICK_ClearGameControllerButton(1<<SDL_CONTROLLER_BUTTON_B);
+    JOYSTICK_ClearGameControllerButton(1<<GAMECONTROLLER_BUTTON_B);
 #if defined(GEKKO)
     JOYSTICK_ClearButton(WII_B);
     JOYSTICK_ClearButton(WII_HOME);