From bbc8154ec7e7baae95ac7d5a7b626ad9ed04ceb4 Mon Sep 17 00:00:00 2001 From: Jeff Teunissen Date: Fri, 24 Dec 2010 02:35:21 -0500 Subject: [PATCH] joystick fixes Make /dev/input/js0 the default joy_device, and temporarily bump max buttons to 18 (until I kill the maximums entirely) --- include/QF/joystick.h | 2 +- libs/video/targets/joy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/QF/joystick.h b/include/QF/joystick.h index 61fd2aa04..c7aab3287 100644 --- a/include/QF/joystick.h +++ b/include/QF/joystick.h @@ -32,7 +32,7 @@ #include #define JOY_MAX_AXES 8 -#define JOY_MAX_BUTTONS 16 +#define JOY_MAX_BUTTONS 18 extern struct cvar_s *joy_device; // Joystick device name extern struct cvar_s *joy_enable; // Joystick enabling flag diff --git a/libs/video/targets/joy.c b/libs/video/targets/joy.c index c4804a6bc..f9ad7aa88 100644 --- a/libs/video/targets/joy.c +++ b/libs/video/targets/joy.c @@ -190,7 +190,7 @@ JOY_Init_Cvars (void) { int i; - joy_device = Cvar_Get ("joy_device", "/dev/js0", CVAR_NONE | CVAR_ROM, 0, + joy_device = Cvar_Get ("joy_device", "/dev/input/js0", CVAR_NONE | CVAR_ROM, 0, "Joystick device"); joy_enable = Cvar_Get ("joy_enable", "1", CVAR_NONE | CVAR_ARCHIVE, 0, "Joystick enable flag");