fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-04-20 09:55:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename buttons

Browse source
This commit is contained in:
Eric Wasylishen 2016-02-29 14:38:02 -07:00
parent 1358af7a00
commit 35dbeb9e6e
6 changed files with 60 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
quakespasm/Quake/gl_screen.c
View file

@ -924,8 +924,8 @@ int SCR_ModalMessage (const char *text, float timeout) //johnfitz -- timeout
} while (lastchar != 'y' && lastchar != 'Y' &&
lastchar != 'n' && lastchar != 'N' &&
lastkey != K_ESCAPE &&
lastkey != K_X360_A &&
lastkey != K_X360_B &&
lastkey != K_ABUTTON &&
lastkey != K_BBUTTON &&
time2 <= time1);
Key_EndInputGrab ();
@ -936,7 +936,7 @@ int SCR_ModalMessage (const char *text, float timeout) //johnfitz -- timeout
return false;
//johnfitz
return (lastchar == 'y' || lastchar == 'Y' || lastkey == K_X360_A);
return (lastchar == 'y' || lastchar == 'Y' || lastkey == K_ABUTTON);
}

4
quakespasm/Quake/gl_vidsdl.c
View file

@ -1951,7 +1951,7 @@ static void VID_MenuKey (int key)
switch (key)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
VID_SyncCvars (); //sync cvars before leaving menu. FIXME: there are other ways to leave menu
S_LocalSound ("misc/menu1.wav");
M_Menu_Options_f ();
@ -2015,7 +2015,7 @@ static void VID_MenuKey (int key)
case K_ENTER:
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
m_entersound = true;
switch (video_options_cursor)
{

20
quakespasm/Quake/in_sdl.c
View file

@ -475,16 +475,16 @@ static int IN_KeyForControllerButton(SDL_GameControllerButton button)
{
switch (button)
{
case SDL_CONTROLLER_BUTTON_A: return K_X360_A;
case SDL_CONTROLLER_BUTTON_B: return K_X360_B;
case SDL_CONTROLLER_BUTTON_X: return K_X360_X;
case SDL_CONTROLLER_BUTTON_Y: return K_X360_Y;
case SDL_CONTROLLER_BUTTON_A: return K_ABUTTON;
case SDL_CONTROLLER_BUTTON_B: return K_BBUTTON;
case SDL_CONTROLLER_BUTTON_X: return K_XBUTTON;
case SDL_CONTROLLER_BUTTON_Y: return K_YBUTTON;
case SDL_CONTROLLER_BUTTON_BACK: return K_ESCAPE;
case SDL_CONTROLLER_BUTTON_START: return K_ESCAPE;
case SDL_CONTROLLER_BUTTON_LEFTSTICK: return K_X360_LEFT_THUMB;
case SDL_CONTROLLER_BUTTON_RIGHTSTICK: return K_X360_RIGHT_THUMB;
case SDL_CONTROLLER_BUTTON_LEFTSHOULDER: return K_X360_LEFT_SHOULDER;
case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: return K_X360_RIGHT_SHOULDER;
case SDL_CONTROLLER_BUTTON_LEFTSTICK: return K_LTHUMB;
case SDL_CONTROLLER_BUTTON_RIGHTSTICK: return K_RTHUMB;
case SDL_CONTROLLER_BUTTON_LEFTSHOULDER: return K_LSHOULDER;
case SDL_CONTROLLER_BUTTON_RIGHTSHOULDER: return K_RSHOULDER;
case SDL_CONTROLLER_BUTTON_DPAD_UP: return K_UPARROW;
case SDL_CONTROLLER_BUTTON_DPAD_DOWN: return K_DOWNARROW;
case SDL_CONTROLLER_BUTTON_DPAD_LEFT: return K_LEFTARROW;
@ -568,9 +568,9 @@ void IN_Commands (void)
const float triggerThreshold = Sint16ToPlusMinusOne(joy_deadzone_trigger.value);
IN_KeyEventForButton(axisstate.axisvalue[SDL_CONTROLLER_AXIS_TRIGGERLEFT] > triggerThreshold,
newaxisstate.axisvalue[SDL_CONTROLLER_AXIS_TRIGGERLEFT] > triggerThreshold, K_X360_LEFT_TRIGGER, &emulated[8]);
newaxisstate.axisvalue[SDL_CONTROLLER_AXIS_TRIGGERLEFT] > triggerThreshold, K_LTRIGGER, &emulated[8]);
IN_KeyEventForButton(axisstate.axisvalue[SDL_CONTROLLER_AXIS_TRIGGERRIGHT] > triggerThreshold,
newaxisstate.axisvalue[SDL_CONTROLLER_AXIS_TRIGGERRIGHT] > triggerThreshold, K_X360_RIGHT_TRIGGER, &emulated[9]);
newaxisstate.axisvalue[SDL_CONTROLLER_AXIS_TRIGGERRIGHT] > triggerThreshold, K_RTRIGGER, &emulated[9]);
axisstate = newaxisstate;
}

22
quakespasm/Quake/keys.c
View file

@ -161,18 +161,16 @@ keyname_t keynames[] =
{"BACKQUOTE", '`'}, // because a raw backquote may toggle the console
{"TILDE", '~'}, // because a raw tilde may toggle the console
{"X360_START", K_X360_START},
{"X360_BACK", K_X360_BACK},
{"X360_LEFT_THUMB", K_X360_LEFT_THUMB},
{"X360_RIGHT_THUMB", K_X360_RIGHT_THUMB},
{"X360_LEFT_SHOULDER", K_X360_LEFT_SHOULDER},
{"X360_RIGHT_SHOULDER", K_X360_RIGHT_SHOULDER},
{"X360_A", K_X360_A},
{"X360_B", K_X360_B},
{"X360_X", K_X360_X},
{"X360_Y", K_X360_Y},
{"X360_LEFT_TRIGGER", K_X360_LEFT_TRIGGER},
{"X360_RIGHT_TRIGGER", K_X360_RIGHT_TRIGGER},
{"LTHUMB", K_LTHUMB},
{"RTHUMB", K_RTHUMB},
{"LSHOULDER", K_LSHOULDER},
{"RSHOULDER", K_RSHOULDER},
{"ABUTTON", K_ABUTTON},
{"BBUTTON", K_BBUTTON},
{"XBUTTON", K_XBUTTON},
{"YBUTTON", K_YBUTTON},
{"LTRIGGER", K_LTRIGGER},
{"RTRIGGER", K_RTRIGGER},
{NULL, 0}
};

22
quakespasm/Quake/keys.h
View file

@ -143,18 +143,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define K_MOUSE5 242
// SDL2 game controller keys
#define K_X360_START 260
#define K_X360_BACK 261
#define K_X360_LEFT_THUMB 262
#define K_X360_RIGHT_THUMB 263
#define K_X360_LEFT_SHOULDER 264
#define K_X360_RIGHT_SHOULDER 265
#define K_X360_A 266
#define K_X360_B 267
#define K_X360_X 268
#define K_X360_Y 269
#define K_X360_LEFT_TRIGGER 270
#define K_X360_RIGHT_TRIGGER 271
#define K_LTHUMB 262
#define K_RTHUMB 263
#define K_LSHOULDER 264
#define K_RSHOULDER 265
#define K_ABUTTON 266
#define K_BBUTTON 267
#define K_XBUTTON 268
#define K_YBUTTON 269
#define K_LTRIGGER 270
#define K_RTRIGGER 271
#define MAX_KEYS 272
#define MAXCMDLINE 256

50
quakespasm/Quake/menu.c
View file

@ -276,7 +276,7 @@ void M_Main_Key (int key)
switch (key)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
IN_Activate();
key_dest = key_game;
m_state = m_none;
@ -301,7 +301,7 @@ void M_Main_Key (int key)
case K_ENTER:
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
m_entersound = true;
switch (m_main_cursor)
@ -366,7 +366,7 @@ void M_SinglePlayer_Key (int key)
switch (key)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
M_Menu_Main_f ();
break;
@ -384,7 +384,7 @@ void M_SinglePlayer_Key (int key)
case K_ENTER:
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
m_entersound = true;
switch (m_singleplayer_cursor)
@ -518,13 +518,13 @@ void M_Load_Key (int k)
switch (k)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
M_Menu_SinglePlayer_f ();
break;
case K_ENTER:
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
S_LocalSound ("misc/menu2.wav");
if (!loadable[load_cursor])
return;
@ -564,13 +564,13 @@ void M_Save_Key (int k)
switch (k)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
M_Menu_SinglePlayer_f ();
break;
case K_ENTER:
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
m_state = m_none;
IN_Activate();
key_dest = key_game;
@ -636,7 +636,7 @@ void M_MultiPlayer_Key (int key)
switch (key)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
M_Menu_Main_f ();
break;
@ -654,7 +654,7 @@ void M_MultiPlayer_Key (int key)
case K_ENTER:
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
m_entersound = true;
switch (m_multiplayer_cursor)
{
@ -745,7 +745,7 @@ void M_Setup_Key (int k)
switch (k)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
M_Menu_MultiPlayer_f ();
break;
@ -785,7 +785,7 @@ forward:
case K_ENTER:
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
if (setup_cursor == 0 || setup_cursor == 1)
return;
@ -938,7 +938,7 @@ again:
switch (k)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
M_Menu_MultiPlayer_f ();
break;
@ -956,7 +956,7 @@ again:
case K_ENTER:
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
m_entersound = true;
M_Menu_LanConfig_f ();
break;
@ -1235,13 +1235,13 @@ void M_Options_Key (int k)
switch (k)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
M_Menu_Main_f ();
break;
case K_ENTER:
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
m_entersound = true;
switch (options_cursor)
{
@ -1464,7 +1464,7 @@ void M_Keys_Key (int k)
switch (k)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
M_Menu_Options_f ();
break;
@ -1486,7 +1486,7 @@ void M_Keys_Key (int k)
case K_ENTER: // go into bind mode
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
M_FindKeysForCommand (bindnames[keys_cursor][0], keys);
S_LocalSound ("misc/menu2.wav");
if (keys[2] != -1)
@ -1552,7 +1552,7 @@ void M_Help_Key (int key)
switch (key)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
M_Menu_Main_f ();
break;
@ -1782,7 +1782,7 @@ void M_LanConfig_Key (int key)
switch (key)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
M_Menu_Net_f ();
break;
@ -1802,7 +1802,7 @@ void M_LanConfig_Key (int key)
case K_ENTER:
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
if (lanConfig_cursor == 0)
break;
@ -2294,7 +2294,7 @@ void M_GameOptions_Key (int key)
switch (key)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
M_Menu_Net_f ();
break;
@ -2328,7 +2328,7 @@ void M_GameOptions_Key (int key)
case K_ENTER:
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
S_LocalSound ("misc/menu2.wav");
if (gameoptions_cursor == 0)
{
@ -2460,7 +2460,7 @@ void M_ServerList_Key (int k)
switch (k)
{
case K_ESCAPE:
case K_X360_B:
case K_BBUTTON:
M_Menu_LanConfig_f ();
break;
@ -2486,7 +2486,7 @@ void M_ServerList_Key (int k)
case K_ENTER:
case K_KP_ENTER:
case K_X360_A:
case K_ABUTTON:
S_LocalSound ("misc/menu2.wav");
m_return_state = m_state;
m_return_onerror = true;