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 559fa88119da50e52550a91944f95d62cec82745..691e2d853fd4cf79290aa0b28aaad58580794afc 100644 (file)
--- 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 50183ce6a864490b0e26f9706522f9ddfcc78493..3d1a5403712789388290c088c81e9856319a3863 100644 (file)
--- 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