yquake2
/
yquake2remaster
mirror of https://github.com/yquake2/yquake2remaster.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #811 from protocultor/sdlbackbutton 

Added cvar to define SDL gamepad's 'Back' button
This commit is contained in:
Yamagi 2022-04-11 09:26:07 +02:00 committed by GitHub
parent 9d451faca5 fadb281ec9
commit c9a5bc5d03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/040_cvarlist.md
View File

@ -117,6 +117,13 @@ it's `+set busywait 0` (setting the `busywait` cvar) and `-portable`
during gameplay and released otherwise (in menu, videos, console or if
game is paused).
**in_sdlbackbutton**: Defines which button is used in the gamepad or
joystick as the `Esc` key, that is, to be able to access the menu
and 'cancel'/'go back' on its options. When set to `0` (the default)
the Back/Select/Minus button is used. Set this to `1` to use the
Start/Menu/Plus button, and to `2` to use the Guide/Home/PS button.
Requires a game restart when changed.
* **singleplayer**: Only available in the dedicated server. Vanilla
Quake II enforced that either `coop` or `deathmatch` is set to `1`
when running the dedicated server. That made it impossible to play

22
src/client/input/sdl.c
View File

@ -48,6 +48,7 @@
// actual movement functions called at a later time.
static float mouse_x, mouse_y;
static int back_button_id = -1;
static int sdl_back_button = SDL_CONTROLLER_BUTTON_BACK;
static float joystick_yaw, joystick_pitch;
static float joystick_forwardmove, joystick_sidemove;
static float joystick_up;
@ -586,7 +587,7 @@ IN_Update(void)
{
qboolean down = (event.type == SDL_CONTROLLERBUTTONDOWN);
if (event.cbutton.button == SDL_CONTROLLER_BUTTON_BACK)
if (event.cbutton.button == sdl_back_button)
{
Key_Event(K_JOY_BACK, down, true);
}
@ -1200,6 +1201,7 @@ Haptic_Feedback(char *name, int effect_volume, int effect_duration,
void
IN_Init(void)
{
static cvar_t *in_sdlbackbutton;
Com_Printf("------- input initialization -------\n");
mouse_x = mouse_y = 0;
@ -1242,6 +1244,22 @@ IN_Init(void)
windowed_mouse = Cvar_Get("windowed_mouse", "1", CVAR_USERINFO | CVAR_ARCHIVE);
in_sdlbackbutton = Cvar_Get("in_sdlbackbutton", "0", CVAR_ARCHIVE);
if (in_sdlbackbutton)
{
switch ((int)in_sdlbackbutton->value)
{
case 1:
sdl_back_button = SDL_CONTROLLER_BUTTON_START;
break;
case 2:
sdl_back_button = SDL_CONTROLLER_BUTTON_GUIDE;
break;
default:
sdl_back_button = SDL_CONTROLLER_BUTTON_BACK;
}
}
Cmd_AddCommand("+mlook", IN_MLookDown);
Cmd_AddCommand("-mlook", IN_MLookUp);
@ -1304,7 +1322,7 @@ IN_Init(void)
Com_Printf (" * triggerleft = %f\n", joy_axis_triggerleft_threshold->value);
Com_Printf (" * triggerright = %f\n", joy_axis_triggerright_threshold->value);
backBind = SDL_GameControllerGetBindForButton(controller, SDL_CONTROLLER_BUTTON_BACK);
backBind = SDL_GameControllerGetBindForButton(controller, sdl_back_button);
if (backBind.bindType == SDL_CONTROLLER_BINDTYPE_BUTTON)
{