From: terencehill <piuntn@gmail.com>
Date: Tue, 31 Aug 2010 22:42:13 +0000 (+0200)
Subject: Show the vote commands when hud_showbinds is 0 or 2
X-Git-Tag: xonotic-v0.1.0preview~315^2~2^2~1
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=4b6d25c4e29a963859c9b4b609a080765183761c;ds=sidebyside

Show the vote commands when hud_showbinds is 0 or 2
Use the term command in hud_showbinds* cvars definitions because it's more appropriated, not only for the vote commands.
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 559fa8811..691e2d853 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1376,8 +1376,8 @@ seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averag
 seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point"
 seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold 0.5 "threshold for fps change when to update instantly, to make big fps changes update faster"
 
-seta hud_showbinds 1	"the way to show the keys to press in HUD messages: 0 displays only actions, 1 only bound keys, 2 both"
-seta hud_showbinds_limit 2	"maximum number of bound keys to show for an action. 0 for unlimited"
+seta hud_showbinds 1	"the way to show the keys to press in HUD messages: 0 displays commands, 1 bound keys, 2 both"
+seta hud_showbinds_limit 2	"maximum number of bound keys to show for a command. 0 for unlimited"
 
 // scoreboard
 seta scoreboard_columns default
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 50183ce6a..3d1a54037 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -3821,9 +3821,9 @@ void HUD_VoteWindow(void)
 	drawcolorcodedstring_aspect(pos + eY * (2/8) * mySize_y, s, eX * mySize_x + eY * (1.75/8) * mySize_y, a, DRAWFLAG_NORMAL);
 
 	// print the yes/no counts
-	s = strcat("Yes (", getcommandkey("not bound", "vyes"), "): ", ftos(vote_yescount));
+	s = strcat("Yes (", getcommandkey("vyes", "vyes"), "): ", ftos(vote_yescount));
 	drawstring_aspect(pos + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '0 1 0', a, DRAWFLAG_NORMAL);
-	s = strcat("No (", getcommandkey("not bound", "vno"), "): ", ftos(vote_nocount));
+	s = strcat("No (", getcommandkey("vno", "vno"), "): ", ftos(vote_nocount));
 	drawstring_aspect(pos + eX * 0.5 * mySize_x + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '1 0 0', a, DRAWFLAG_NORMAL);
 
 	// draw the progress bar backgrounds