From a9786962ae7078339dabc99b92befe9c8c4caf0b Mon Sep 17 00:00:00 2001
From: tomaz <tomaz@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 12 Sep 2004 18:11:24 +0000
Subject: [PATCH] Added support for 16 joystick buttons.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4490 d7cf8633-e32d-0410-b094-e92efae38249
---
 keys.c    | 20 ++++++++++++++++----
 keys.h    | 12 ++++++++++++
 vid_wgl.c |  4 ++--
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/keys.c b/keys.c
index d4935d05..f1fa5c52 100644
--- a/keys.c
+++ b/keys.c
@@ -154,10 +154,22 @@ static const keyname_t   keynames[] = {
 	{"KP_ENTER", K_KP_ENTER},
 	{"KP_EQUALS", K_KP_EQUALS},
 
-	{"JOY1", K_JOY1},
-	{"JOY2", K_JOY2},
-	{"JOY3", K_JOY3},
-	{"JOY4", K_JOY4},
+	{"JOY1",  K_JOY1},
+	{"JOY2",  K_JOY2},
+	{"JOY3",  K_JOY3},
+	{"JOY4",  K_JOY4},
+	{"JOY5",  K_JOY5},
+	{"JOY6",  K_JOY6},
+	{"JOY7",  K_JOY7},
+	{"JOY8",  K_JOY8},
+	{"JOY9",  K_JOY9},
+	{"JOY10", K_JOY10},
+	{"JOY11", K_JOY11},
+	{"JOY12", K_JOY12},
+	{"JOY13", K_JOY13},
+	{"JOY14", K_JOY14},
+	{"JOY15", K_JOY15},
+	{"JOY16", K_JOY16},
 
 	{"AUX1", K_AUX1},
 	{"AUX2", K_AUX2},
diff --git a/keys.h b/keys.h
index a9a852e1..b8eb9dfb 100644
--- a/keys.h
+++ b/keys.h
@@ -131,6 +131,18 @@ extern enum {
 	K_JOY2,
 	K_JOY3,
 	K_JOY4,
+	K_JOY5,
+	K_JOY6,
+	K_JOY7,
+	K_JOY8,
+	K_JOY9,
+	K_JOY10,
+	K_JOY11,
+	K_JOY12,
+	K_JOY13,
+	K_JOY14,
+	K_JOY15,
+	K_JOY16,
 
 //
 // aux keys are for multi-buttoned joysticks to generate so they can use
diff --git a/vid_wgl.c b/vid_wgl.c
index afa865cf..99235ff2 100644
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -1702,13 +1702,13 @@ void IN_Commands (void)
 	{
 		if ( (buttonstate & (1<<i)) && !(joy_oldbuttonstate & (1<<i)) )
 		{
-			key_index = (i < 4) ? K_JOY1 : K_AUX1;
+			key_index = (i < 16) ? K_JOY1 : K_AUX1;
 			Key_Event (key_index + i, 0, true);
 		}
 
 		if ( !(buttonstate & (1<<i)) && (joy_oldbuttonstate & (1<<i)) )
 		{
-			key_index = (i < 4) ? K_JOY1 : K_AUX1;
+			key_index = (i < 16) ? K_JOY1 : K_AUX1;
 			Key_Event (key_index + i, 0, false);
 		}
 	}
-- 
2.39.2