From 256ed6e7f6ed5631e0466f1774cb597535f06e1b Mon Sep 17 00:00:00 2001 From: svdijk <svdijk@af15c1b1-3010-417e-b628-4374ebc0bcbd> Date: Mon, 23 Apr 2012 18:01:47 +0000 Subject: [PATCH] keys.[ch]: comment out KP_* keys, since we map them to their K_* counterparts git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@663 af15c1b1-3010-417e-b628-4374ebc0bcbd --- quakespasm/Quake/keys.c | 6 ++++++ quakespasm/Quake/keys.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/quakespasm/Quake/keys.c b/quakespasm/Quake/keys.c index 0f2f180f..3a20f9c6 100644 --- a/quakespasm/Quake/keys.c +++ b/quakespasm/Quake/keys.c @@ -76,6 +76,7 @@ keyname_t keynames[] = {"CTRL", K_CTRL}, {"SHIFT", K_SHIFT}, +#if 0 /* QuakeSpasm: keypad keys are mapped to their non-keypad counterparts */ //johnfitz -- keypad {"KP_NUMLOCK", KP_NUMLOCK}, {"KP_SLASH", KP_SLASH }, @@ -95,6 +96,7 @@ keyname_t keynames[] = {"KP_INS", KP_INS }, {"KP_DEL", KP_DEL }, //johnfitz +#endif {"F1", K_F1}, {"F2", K_F2}, @@ -194,7 +196,9 @@ void Key_Console (int key) switch (key) { case K_ENTER: +#if 0 /* QuakeSpasm: keypad keys are mapped to their non-keypad counterparts */ case KP_ENTER: +#endif key_tabpartial[0] = 0; Cbuf_AddText (key_lines[edit_line]+1); // skip the prompt Cbuf_AddText ("\n"); @@ -769,7 +773,9 @@ void Key_Init (void) for (i=32 ; i<128 ; i++) consolekeys[i] = true; consolekeys[K_ENTER] = true; +#if 0 /* QuakeSpasm: keypad keys are mapped to their non-keypad counterparts */ consolekeys[KP_ENTER] = true; //johnfitz +#endif consolekeys[K_TAB] = true; consolekeys[K_LEFTARROW] = true; consolekeys[K_RIGHTARROW] = true; diff --git a/quakespasm/Quake/keys.h b/quakespasm/Quake/keys.h index 4ae71705..d6aa02b9 100644 --- a/quakespasm/Quake/keys.h +++ b/quakespasm/Quake/keys.h @@ -60,6 +60,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define K_HOME 151 #define K_END 152 +#if 0 /* QuakeSpasm: keypad keys are mapped to their non-keypad counterparts */ //johnfitz -- keypad #define KP_NUMLOCK 153 #define KP_SLASH 154 @@ -79,6 +80,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define KP_INS 168 #define KP_DEL 169 //johnfitz +#endif #define K_PAUSE 255