cl_vyes/cl_vno => vyes/vno

diff --git a/keybinds.txt b/keybinds.txt
index 7738584dd1d7d57128577d9035667ccd254c58d9..1e4a74d6631455447600c9d91da66f4871d8f568 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -38,8 +38,8 @@
 "messagemode"                           "public chat"
 "messagemode2"                          "team chat"
 "+con_chat_maximize"                    "show chat history"
-"cl_cmd cl_vyes"                        "vote YES"
-"cl_cmd cl_vno"                         "vote NO"
+"cl_cmd vyes"                           "vote YES"
+"cl_cmd vno"                            "vote NO"
 "ready"                                 "ready"
 ""                                      ""
 ""                                      "Client"

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 24ab85585bf5f00cfbefa8c8868737f28eb9bacf..1a3608aa324d4bf4d0ecc619d359cb756657804a 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -608,7 +608,7 @@ void GameCommand(string msg)
                e.draw = DrawDebugModel;
                e.classname = "debugmodel";
        }
-    else if(cmd == "cl_vyes")
+    else if(cmd == "vyes")
     {
         if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE) && panel_fg_alpha && !scoreboard_active) // don't lock keys before we actually see what's going on
         {
@@ -622,7 +622,7 @@ void GameCommand(string msg)
             localcmd("vyes\n");
         }
     }
-    else if(cmd == "cl_vno")
+    else if(cmd == "vno")
     {
         if(autocvar_cl_allow_uid2name == -1 && (gametype == GAME_CTS || gametype == GAME_RACE) && panel_fg_alpha && !scoreboard_active) // don't lock keys before we actually see what's going on
         {

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 7419f52b8d1de92166afe879c6f60739ec21c107..759435e63d281a0233aca0b26ad7a3f3643be768 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -3943,9 +3943,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("cl_cmd cl_vyes", "cl_cmd cl_vyes"), "): ", ftos(vote_yescount));
+    s = strcat("Yes (", getcommandkey("cl_cmd vyes", "cl_cmd 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("cl_cmd cl_vno", "cl_cmd cl_vno"), "): ", ftos(vote_nocount));
+    s = strcat("No (", getcommandkey("cl_cmd vno", "cl_cmd 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