From 3ec0afc09d9dab256e42aad7e7b3b6ea1db7abc7 Mon Sep 17 00:00:00 2001
From: wolfy852 <wolfy852@hotmail.com>
Date: Sun, 2 Dec 2018 19:33:09 -0600
Subject: [PATCH] AXISBRAKE, take out GameController stuff for now

---
 src/g_game.c       | 1 +
 src/sdl/i_system.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/g_game.c b/src/g_game.c
index e28248fc..9036ff9d 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1386,6 +1386,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 		axis = JoyAxis(AXISMOVE, ssplayer);
 		if (InputDown(gc_accelerate, ssplayer) || (usejoystick && axis > 0))
 			cmd->buttons |= BT_ACCELERATE;
+		axis = JoyAxis(AXISBRAKE, ssplayer);
 		if (InputDown(gc_brake, ssplayer) || (usejoystick && axis > 0))
 			cmd->buttons |= BT_BRAKE;
 		axis = JoyAxis(AXISAIM, ssplayer);
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 5fdeb4b7..a1a9df90 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -1060,7 +1060,7 @@ static int joy_open(const char *fname)
 
 	if (joystick_started == 0 && joystick2_started == 0 && joystick3_started == 0 && joystick4_started == 0)
 	{
-		if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) == -1)
+		if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1)
 		{
 			CONS_Printf(M_GetText("Couldn't initialize joystick: %s\n"), SDL_GetError());
 			return -1;