stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-14 22:00:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

AXISBRAKE, take out GameController stuff for now

Browse source
This commit is contained in:
wolfy852 2018-12-02 19:33:09 -06:00
parent d1a0df09a5
commit 3ec0afc09d
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/g_game.c
View file

@ -1386,6 +1386,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
axis = JoyAxis(AXISMOVE, ssplayer); axis = JoyAxis(AXISMOVE, ssplayer);
if (InputDown(gc_accelerate, ssplayer) || (usejoystick && axis > 0)) if (InputDown(gc_accelerate, ssplayer) || (usejoystick && axis > 0))
cmd->buttons |= BT_ACCELERATE; cmd->buttons |= BT_ACCELERATE;
axis = JoyAxis(AXISBRAKE, ssplayer);
if (InputDown(gc_brake, ssplayer) || (usejoystick && axis > 0)) if (InputDown(gc_brake, ssplayer) || (usejoystick && axis > 0))
cmd->buttons |= BT_BRAKE; cmd->buttons |= BT_BRAKE;
axis = JoyAxis(AXISAIM, ssplayer); axis = JoyAxis(AXISAIM, ssplayer);

2
src/sdl/i_system.c
View file

@ -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 (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()); CONS_Printf(M_GetText("Couldn't initialize joystick: %s\n"), SDL_GetError());
return -1; return -1;