commit 112bc3fcab6654c20bc980a04d377b5b03044067
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Oct 20 23:06:53 2011 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Thu Oct 20 23:06:53 2011 +0000
Change labels in setup tool for Strife popup windows to have more
descriptive names.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2448
---
src/setup/keyboard.c | 6 +++---
src/setup/mainmenu.c | 9 ++++++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/setup/keyboard.c b/src/setup/keyboard.c
index 4c74fd4e..42ee71de 100644
--- a/src/setup/keyboard.c
+++ b/src/setup/keyboard.c
@@ -216,9 +216,9 @@ static void ConfigExtraKeys(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
AddKeyControl(table, "End", &key_invend);
AddKeyControl(table, "Query", &key_invquery);
AddKeyControl(table, "Drop", &key_invdrop);
- AddKeyControl(table, "PopWeap", &key_invpop);
- AddKeyControl(table, "PopMiss", &key_mission);
- AddKeyControl(table, "PopKey", &key_invkey);
+ AddKeyControl(table, "Show weapons", &key_invpop);
+ AddKeyControl(table, "Show mission", &key_mission);
+ AddKeyControl(table, "Show keys", &key_invkey);
AddKeyControl(table, "Use", &key_invuse);
AddKeyControl(table, "Use health", &key_usehealth);
}
diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c
index bfe2cdf7..ec7fe06e 100644
--- a/src/setup/mainmenu.c
+++ b/src/setup/mainmenu.c
@@ -75,11 +75,14 @@ static void SensibleDefaults(void)
key_nextweapon = '.';
key_invleft = '[';
key_invright = ']';
- key_message_refresh = KEY_ENTER;
- mousebprevweapon = 4;
+ key_message_refresh = '\'';
+ key_mission = 'i'; // Strife keys
+ key_invpop = 'o';
+ key_invkey = 'p';
+ mousebprevweapon = 4; // Scroll wheel = weapon cycle
mousebnextweapon = 3;
snd_musicdevice = 3;
- joybspeed = 29;
+ joybspeed = 29; // Always run
vanilla_savegame_limit = 0;
vanilla_keyboard_mapping = 0;
vanilla_demo_limit = 0;