X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=keys.c;h=52363ee0c62f8013889bbd999fd062461f49ae7f;hb=90a6130a618f72bef104521840169b03d1cc7794;hp=e3048b7626a363cc6fd56a8b168aa178d9990692;hpb=fb4e382ea334459e09f266944ea1a257ec97d8f8;p=xonotic%2Fdarkplaces.git

diff --git a/keys.c b/keys.c
index e3048b76..52363ee0 100644
--- a/keys.c
+++ b/keys.c
@@ -28,7 +28,6 @@ static const char rcsid[] =
 #include "quakedef.h"
 #include <ctype.h>
 
-extern void SCR_UpdateScreen (void);
 
 /*
 key up events are sent even if in console mode
@@ -154,10 +153,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},
@@ -272,8 +283,6 @@ Key_Console (int key, char ascii)
 		break;
 	}
 
-	// LordHavoc: FIXME: implement this sometime
-	#if 0
 	if ((toupper(key) == 'V' && keydown[K_CTRL]) || ((key == K_INS || key == K_KP_INS) && keydown[K_SHIFT]))
 	{
 		char *cbd;
@@ -294,7 +303,6 @@ Key_Console (int key, char ascii)
 		}
 		return;
 	}
-	#endif
 
 	if (key == 'l')
 	{
@@ -496,13 +504,9 @@ static void
 Key_Message (int key, char ascii)
 {
 
-	if (key == K_ENTER) {
-		if (chat_team)
-			Cbuf_AddText ("say_team \"");
-		else
-			Cbuf_AddText ("say \"");
-		Cbuf_AddText (chat_buffer);
-		Cbuf_AddText ("\"\n");
+	if (key == K_ENTER)
+	{
+		Cmd_ForwardStringToServer(va("%s %s", chat_team ? "say_team" : "say ", chat_buffer));
 
 		key_dest = key_game;
 		chat_bufferlen = 0;
@@ -788,12 +792,12 @@ Key_WriteBindings (qfile_t *f)
 
 	for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
 		if (keybindings[0][i])
-			FS_Printf(f, "bind %s \"%s\"\n",
+			FS_Printf(f, "bind \"%s\" \"%s\"\n",
 					Key_KeynumToString (i), keybindings[0][i]);
 	for (j = 1; j < 8; j++)
 		for (i = 0; i < (int)(sizeof(keybindings[0])/sizeof(keybindings[0][0])); i++)
 			if (keybindings[j][i])
-				FS_Printf(f, "in_bind %d %s \"%s\"\n",
+				FS_Printf(f, "in_bind %d \"%s\" \"%s\"\n",
 						j, Key_KeynumToString (i), keybindings[j][i]);
 }
 
@@ -882,7 +886,7 @@ Key_Event (int key, char ascii, qboolean down)
 		key_repeats[key]++;
 		if (key_repeats[key] > 1) {
 			if ((key_consoleactive && !consolekeys[key]) ||
-					(key_dest == key_game &&
+					(!key_consoleactive && key_dest == key_game &&
 					 (cls.state == ca_connected && cls.signon == SIGNONS)))
 				return;						// ignore most autorepeats
 		}