[nexuiz-commits] r7402 - in trunk/data: . qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: m0rfar
Date: 2009-08-09 05:55:52 -0400 (Sun, 09 Aug 2009)
New Revision: 7402

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c
   trunk/data/tooltips.db
Log:
sbar_showbinds better description (#429)

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-08-09 09:39:32 UTC (rev 7401)
+++ trunk/data/defaultNexuiz.cfg	2009-08-09 09:55:52 UTC (rev 7402)
@@ -1413,8 +1413,8 @@
 alias sbar_font "loadfont user1 $*; loadfont user2 ${*}-big; sbar_columns_set"
 seta sbar_columns default
 sbar_font gfx/vera-sans
-seta sbar_showbinds 1	"0 disables display of keybinds, 1 enables it, 2 displays longer strings"
-seta sbar_showbinds_limit 2	"display so many found keybinds, 0 for unlimited"
+seta sbar_showbinds 1	"display actions / bound keys in the strings shown during the game. 0 displays only actions, 1 displays only bound keys, 2 displays both"
+seta sbar_showbinds_limit 2	"maximum number of bound keys to show for an action. 0 for unlimited"
 
 // these entities are not referenced by anything directly, they just represent
 // teams and are found by find() when needed

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c	2009-08-09 09:39:32 UTC (rev 7401)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c	2009-08-09 09:55:52 UTC (rev 7402)
@@ -67,9 +67,9 @@
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Show binds:"));
 		me.TD(me, 1, 2, e = makeNexuizTextSlider("sbar_showbinds"));
-			e.addValue(e, "None", "0");
-			e.addValue(e, "Short", "1");
-			e.addValue(e, "Long", "2");
+			e.addValue(e, "Actions", "0");
+			e.addValue(e, "Bound keys", "1");
+			e.addValue(e, "Both", "2");
 			e.configureNexuizTextSliderValues(e);
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(2, 0, "cl_showpressedkeys", "Show pressed keys"));

Modified: trunk/data/tooltips.db
===================================================================
--- trunk/data/tooltips.db	2009-08-09 09:39:32 UTC (rev 7401)
+++ trunk/data/tooltips.db	2009-08-09 09:55:52 UTC (rev 7402)
@@ -96,7 +96,7 @@
 \m_pitch\Invert mouse movement on the Y-axis
 \vid_dgamouse\Make use of DGA mouse input
 \con_closeontoggleconsole\Allow the console toggling bind to also close the console
-\sbar_showbinds\Enable display of keybinds, short for a shorter string and long to display longer strings
+\sbar_showbinds\Display actions / bound keys in the strings shown during the game
 \cl_showpressedkeys\Show which movement keys the player is pressing
 
 \NexuizSettingsDialog/Video\Video settings