just use the old vyes/vno aliases when binding, but let them instead execute cl_cmd...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index afcb1a9c65d94abe1a7bc7f9e0a667c85c54930f..34b8bf35645a90f38a75e7580ead2b318fd5272f 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1058,8 +1058,8 @@ alias vstop "cmd vote stop"
 alias vmaster "cmd vote master"
 alias vlogin "cmd vote login $*"
 alias vdo "cmd vote do $*"
-alias vyes "cmd vote yes"
-alias vno "cmd vote no"
+alias vyes "cl_cmd vyes"
+alias vno "cl_cmd vno"
 alias vdontcare "cmd vote dontcare"
 alias vabstain "cmd vote abstain"
 
@@ -1075,8 +1075,8 @@ alias vdoend "vdo endmatch"
 
 alias lsmaps "cmd lsmaps" // lists all maps on server (for vmap, suggestmap, vnextmap)
 alias lsnewmaps "cmd lsnewmaps" // lists all maps on server that do not yet have a record set (race/cts)
-bind F1 cl_cmd vyes
-bind F2 cl_cmd vno
+bind F1 vyes
+bind F2 vno
 
 //used for spectate/observer mode
 alias spec "cmd spectate"

diff --git a/keybinds.txt b/keybinds.txt
index 1e4a74d6631455447600c9d91da66f4871d8f568..453e09165fe5fe7ea0914d71750bf1fc3b53f20a 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -31,15 +31,14 @@
 ""                                      "View"
 "+zoom"                                 "zoom"
 "+showscores"                           "show scores"
-"+showaccuracy"                                "show accuracy"
 "screenshot"                            "screen shot"
 ""                                      ""
 ""                                      "Communicate"
 "messagemode"                           "public chat"
 "messagemode2"                          "team chat"
 "+con_chat_maximize"                    "show chat history"
-"cl_cmd vyes"                           "vote YES"
-"cl_cmd vno"                            "vote NO"
+"vyes"                                  "vote YES"
+"vno"                                   "vote NO"
 "ready"                                 "ready"
 ""                                      ""
 ""                                      "Client"

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index de87c0d747c66e0ce1f49f1474e74a0d74fb8b1c..24b230c8468b9c85c19de2415048848f1b132247 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -619,7 +619,7 @@ void GameCommand(string msg)
         }
         else
         {
-            localcmd("vyes\n");
+            localcmd("cmd vote yes\n");
         }
     }
     else if(cmd == "vno")
@@ -633,7 +633,7 @@ void GameCommand(string msg)
         }
         else
         {
-            localcmd("vno\n");
+            localcmd("cmd vote no\n");
         }
     }