commit 69be33fe88d0a55dce27214e7543cded8ff51175
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sat Oct 22 15:41:56 2011 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sat Oct 22 15:41:56 2011 +0000
Update setup tool to show 8 key bindings for appropriate games.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2454
---
src/setup/keyboard.c | 16 ++++++++++++----
src/setup/mainmenu.c | 8 ++++++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/setup/keyboard.c b/src/setup/keyboard.c
index 42ee71de..feceaa78 100644
--- a/src/setup/keyboard.c
+++ b/src/setup/keyboard.c
@@ -309,10 +309,18 @@ static void OtherKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
AddSectionLabel(table, "Multiplayer", true);
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]);
+ AddKeyControl(table, "- to player 1", &key_multi_msgplayer[0]);
+ AddKeyControl(table, "- to player 2", &key_multi_msgplayer[1]);
+ AddKeyControl(table, "- to player 3", &key_multi_msgplayer[2]);
+ AddKeyControl(table, "- to player 4", &key_multi_msgplayer[3]);
+
+ if (gamemission == hexen || gamemission == strife)
+ {
+ AddKeyControl(table, "- to player 5", &key_multi_msgplayer[4]);
+ AddKeyControl(table, "- to player 6", &key_multi_msgplayer[5]);
+ AddKeyControl(table, "- to player 7", &key_multi_msgplayer[6]);
+ AddKeyControl(table, "- to player 8", &key_multi_msgplayer[7]);
+ }
scrollpane = TXT_NewScrollPane(0, 13, table);
diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c
index ec7fe06e..be4b0999 100644
--- a/src/setup/mainmenu.c
+++ b/src/setup/mainmenu.c
@@ -79,6 +79,14 @@ static void SensibleDefaults(void)
key_mission = 'i'; // Strife keys
key_invpop = 'o';
key_invkey = 'p';
+ key_multi_msgplayer[0] = 'g';
+ key_multi_msgplayer[1] = 'h';
+ key_multi_msgplayer[2] = 'j';
+ key_multi_msgplayer[3] = 'k';
+ key_multi_msgplayer[4] = 'v';
+ key_multi_msgplayer[5] = 'b';
+ key_multi_msgplayer[6] = 'n';
+ key_multi_msgplayer[7] = 'm';
mousebprevweapon = 4; // Scroll wheel = weapon cycle
mousebnextweapon = 3;
snd_musicdevice = 3;