diff options
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/configfile.c | 5 | ||||
| -rw-r--r-- | setup/keyboard.c | 19 | ||||
| -rw-r--r-- | setup/keyboard.h | 5 |
3 files changed, 28 insertions, 1 deletions
diff --git a/setup/configfile.c b/setup/configfile.c index 9f0e5de5..97d87aaf 100644 --- a/setup/configfile.c +++ b/setup/configfile.c @@ -337,6 +337,11 @@ static default_t extra_defaults_list[] = {"key_weapon8", &key_weapon8, DEFAULT_KEY, 0, 0}, {"key_message_refresh", &key_message_refresh, DEFAULT_KEY, 0, 0}, {"key_demo_quit", &key_demo_quit, DEFAULT_KEY, 0, 0}, + {"key_multi_msg", &key_multi_msg, DEFAULT_KEY, 0, 0}, + {"key_multi_msgplayer1", &key_multi_msgplayer[0], DEFAULT_KEY, 0, 0}, + {"key_multi_msgplayer2", &key_multi_msgplayer[1], DEFAULT_KEY, 0, 0}, + {"key_multi_msgplayer3", &key_multi_msgplayer[2], DEFAULT_KEY, 0, 0}, + {"key_multi_msgplayer4", &key_multi_msgplayer[3], DEFAULT_KEY, 0, 0}, }; static default_collection_t extra_defaults = diff --git a/setup/keyboard.c b/setup/keyboard.c index b402d10c..f16c0940 100644 --- a/setup/keyboard.c +++ b/setup/keyboard.c @@ -93,6 +93,9 @@ int key_weapon8 = '8'; int key_message_refresh = KEY_ENTER; int key_demo_quit = 'q'; +int key_multi_msg = 't'; +int key_multi_msgplayer[] = { 'g', 'i', 'b', 'r' }; + int vanilla_keyboard_mapping = 1; static int always_run = 0; @@ -116,7 +119,9 @@ static int *shortcuts[] = { &key_menu_help, &key_menu_save, &key_menu_load, &key_menu_endgame, &key_menu_messages, &key_menu_qload, &key_menu_quit, &key_menu_gamma, &key_menu_incscreen, &key_menu_decscreen, - &key_message_refresh, NULL }; + &key_message_refresh, &key_multi_msg, + &key_multi_msgplayer[0], &key_multi_msgplayer[1], + &key_multi_msgplayer[2], &key_multi_msgplayer[3] }; static int *map_keys[] = { &key_map_north, &key_map_south, &key_map_east, &key_map_west, &key_map_zoomin, &key_map_zoomout, @@ -278,6 +283,18 @@ static void OtherKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused)) TXT_AddWidgets(table, TXT_NewStrut(0, 1), TXT_NewStrut(0, 1), + TXT_NewLabel(" - Multiplayer - "), + TXT_NewStrut(0, 0), + NULL); + + AddKeyControl(table, "Send message", &key_multi_msg); + AddKeyControl(table, "- to green", &key_multi_msgplayer[0]); + AddKeyControl(table, "- to indigo", &key_multi_msgplayer[1]); + AddKeyControl(table, "- to brown", &key_multi_msgplayer[2]); + AddKeyControl(table, "- to red", &key_multi_msgplayer[3]); + + TXT_AddWidgets(table, TXT_NewStrut(0, 1), + TXT_NewStrut(0, 1), TXT_NewLabel(" - Map - "), TXT_NewStrut(0, 0), NULL); diff --git a/setup/keyboard.h b/setup/keyboard.h index 62addc8f..feeb9cf8 100644 --- a/setup/keyboard.h +++ b/setup/keyboard.h @@ -37,6 +37,11 @@ extern int vanilla_keyboard_mapping; extern int key_pause; +// Multiplayer messages: + +extern int key_multi_msg; +extern int key_multi_msgplayer[]; + // Menu keys: extern int key_menu_activate; |