summaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
authorSimon Howard2010-07-31 19:25:17 +0000
committerSimon Howard2010-07-31 19:25:17 +0000
commit4319d9cda4caab4a9c4d5f98a780ea8d9e3531f6 (patch)
tree6892b64eded8a768b474c006b9f08c4af0e2276d /setup
parent232fba47e0a42af8c3ec0f934eaa855163c4ee35 (diff)
downloadchocolate-doom-4319d9cda4caab4a9c4d5f98a780ea8d9e3531f6.tar.gz
chocolate-doom-4319d9cda4caab4a9c4d5f98a780ea8d9e3531f6.tar.bz2
chocolate-doom-4319d9cda4caab4a9c4d5f98a780ea8d9e3531f6.zip
Add multiplayer spy key binding.
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1948
Diffstat (limited to 'setup')
-rw-r--r--setup/configfile.c1
-rw-r--r--setup/keyboard.c4
-rw-r--r--setup/keyboard.h1
3 files changed, 5 insertions, 1 deletions
diff --git a/setup/configfile.c b/setup/configfile.c
index 6db7f710..5fe1d958 100644
--- a/setup/configfile.c
+++ b/setup/configfile.c
@@ -314,6 +314,7 @@ static default_t extra_defaults_list[] =
{"key_menu_qload", &key_menu_qload, DEFAULT_KEY, 0, 0},
{"key_menu_quit", &key_menu_quit, DEFAULT_KEY, 0, 0},
{"key_menu_gamma", &key_menu_gamma, DEFAULT_KEY, 0, 0},
+ {"key_spy", &key_spy, DEFAULT_KEY, 0, 0},
{"key_menu_incscreen", &key_menu_incscreen, DEFAULT_KEY, 0, 0},
{"key_menu_decscreen", &key_menu_decscreen, DEFAULT_KEY, 0, 0},
diff --git a/setup/keyboard.c b/setup/keyboard.c
index f16c0940..bcf5ec7a 100644
--- a/setup/keyboard.c
+++ b/setup/keyboard.c
@@ -64,6 +64,7 @@ int key_menu_messages = KEY_F8;
int key_menu_qload = KEY_F9;
int key_menu_quit = KEY_F10;
int key_menu_gamma = KEY_F11;
+int key_spy = KEY_F12;
int key_menu_incscreen = KEY_EQUALS;
int key_menu_decscreen = KEY_MINUS;
@@ -116,7 +117,7 @@ static int *menu_nav[] = { &key_menu_activate, &key_menu_up, &key_menu_down,
static int *shortcuts[] = { &key_menu_help, &key_menu_save, &key_menu_load,
&key_menu_volume, &key_menu_detail, &key_menu_qsave,
- &key_menu_endgame, &key_menu_messages,
+ &key_menu_endgame, &key_menu_messages, &key_spy,
&key_menu_qload, &key_menu_quit, &key_menu_gamma,
&key_menu_incscreen, &key_menu_decscreen,
&key_message_refresh, &key_multi_msg,
@@ -274,6 +275,7 @@ static void OtherKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
AddKeyControl(table, "Quick load", &key_menu_qload);
AddKeyControl(table, "Quit game", &key_menu_quit);
AddKeyControl(table, "Toggle gamma", &key_menu_gamma);
+ AddKeyControl(table, "Multiplayer spy", &key_spy);
AddKeyControl(table, "Increase screen size", &key_menu_incscreen);
AddKeyControl(table, "Decrease screen size", &key_menu_decscreen);
diff --git a/setup/keyboard.h b/setup/keyboard.h
index feeb9cf8..f934116f 100644
--- a/setup/keyboard.h
+++ b/setup/keyboard.h
@@ -65,6 +65,7 @@ extern int key_menu_messages;
extern int key_menu_qload;
extern int key_menu_quit;
extern int key_menu_gamma;
+extern int key_spy;
extern int key_menu_incscreen;
extern int key_menu_decscreen;