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

tidy

Browse source
This commit is contained in:
Eric Wasylishen 2016-02-08 17:21:44 -07:00
parent 620d0e0fab
commit b53b78590c
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
quakespasm/Quake/in_sdl.c
View file

@ -78,6 +78,8 @@ typedef struct
static SDL_JoystickID joy_active_instaceid = -1;
static SDL_GameController *joy_active_controller = NULL;
static qboolean no_mouse = false;
static int buttonremap[] =
{
K_MOUSE1,
@ -91,7 +93,6 @@ static int buttonremap[] =
K_MOUSE5
};
static qboolean no_mouse = false;
static dualAxis_t _rawDualAxis = {0};
/* total accumulated mouse movement since last frame */
@ -367,7 +368,7 @@ void IN_Init (void)
Con_Printf( "WARNING: Could not initialize SDL Game Controller\n" );
} else {
int i;
for ( i = 0; i < SDL_NumJoysticks(); i++ )
{
if ( SDL_IsGameController(i) )
@ -460,7 +461,6 @@ void IN_ControllerAxis(SDL_JoystickID instanceid, SDL_GameControllerAxis axis, S
switch (axis)
{
// TODO: swap move/look cvar
case SDL_CONTROLLER_AXIS_LEFTX:
_rawDualAxis.left.x = axisValue;
break;

4
quakespasm/Quake/keys.c
View file

@ -173,7 +173,7 @@ keyname_t keynames[] =
{"X360_Y", K_X360_Y},
{"X360_LEFT_TRIGGER", K_X360_LEFT_TRIGGER},
{"X360_RIGHT_TRIGGER", K_X360_RIGHT_TRIGGER},
//{"X360_GUIDE", K_X360_GUIDE},
{NULL, 0}
};
@ -949,7 +949,7 @@ void Key_Event (int key, qboolean down)
if (key < 0 || key >= MAX_KEYS)
return;
// handle fullscreen toggle
if (down && (key == K_ENTER || key == K_KP_ENTER) && keydown[K_ALT])
{

2
quakespasm/Quake/keys.h
View file

@ -155,7 +155,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define K_X360_Y 269
#define K_X360_LEFT_TRIGGER 270
#define K_X360_RIGHT_TRIGGER 271
#define MAX_KEYS 280
#define MAX_KEYS 272
#define MAXCMDLINE 256