shithub: choc

Info  •  Files  •  Log  •  Branches

Change labels in setup tool for Strife popup windows to have more
descriptive names.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2448

--- a/src/setup/keyboard.c

+++ b/src/setup/keyboard.c

@@ -216,9 +216,9 @@

             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);

         }

--- a/src/setup/mainmenu.c

+++ b/src/setup/mainmenu.c

@@ -75,11 +75,14 @@

     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;