sydney/q3-sydney-qvm
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into sdl2

Browse Source 
Conflicts:
	Makefile
	code/renderergl2/tr_image.c
This commit is contained in:
Tim Angus committed 2014-08-25 15:00:48 +01:00
2 parents 7d026177ad ca9eebb125
commit 2a3368481d
24 files changed
+431 -227
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/sdl/sdl_input.c
-5
View File
@@ -44,7 +44,6 @@ static cvar_t *in_mouse = NULL;
static cvar_t *in_nograb;
static cvar_t *in_joystick = NULL;
static cvar_t *in_joystickDebug = NULL;
static cvar_t *in_joystickThreshold = NULL;
static cvar_t *in_joystickNo = NULL;
static cvar_t *in_joystickUseAnalog = NULL;
@@ -507,7 +506,6 @@ IN_JoyMove
*/
static void IN_JoyMove( void )
{
qboolean joy_pressed[ARRAY_LEN(joy_keys)];
unsigned int axes = 0;
unsigned int hats = 0;
int total = 0;
@@ -518,8 +516,6 @@ static void IN_JoyMove( void )
SDL_JoystickUpdate();
memset(joy_pressed, '\0', sizeof (joy_pressed));
// update the ball state.
total = SDL_JoystickNumBalls(stick);
if (total > 0)
@@ -951,7 +947,6 @@ void IN_Init( void *windowData )
in_nograb = Cvar_Get( "in_nograb", "0", CVAR_ARCHIVE );
in_joystick = Cvar_Get( "in_joystick", "0", CVAR_ARCHIVE|CVAR_LATCH );
in_joystickDebug = Cvar_Get( "in_joystickDebug", "0", CVAR_TEMP );
in_joystickThreshold = Cvar_Get( "joy_threshold", "0.15", CVAR_ARCHIVE );
SDL_StartTextInput( );