From: Samual <samual@xonotic.org>
Date: Sat, 24 Mar 2012 19:12:39 +0000 (-0400)
Subject: Strip out more 0.5 compatibility in command system
X-Git-Tag: xonotic-v0.7.0~31^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=10eeee0cba45dc7aa7b43383466d63b2e10e9b0f;p=xonotic%2Fxonotic-data.pk3dir.git

Strip out more 0.5 compatibility in command system
---

diff --git a/commands.cfg b/commands.cfg
index 174a45834..a2e1f0396 100644
--- a/commands.cfg
+++ b/commands.cfg
@@ -115,8 +115,6 @@ alias hud                  "qc_cmd_cl     hud                  ${* ?}" // Comman
 alias localprint           "qc_cmd_cl     localprint           ${* ?}" // Create your own centerprint sent to yourself
 //alias mv_download        "qc_cmd_cl     mv_download          ${* ?}" // Retrieve mapshot picture from the server
 alias sendcvar             "qc_cmd_cl     sendcvar             ${* ?}" // Send a cvar to the server (like weaponpriority)
-//alias vyes               "qc_cmd_cl     vyes                 ${* ?}" // COMPATIBILITY COMMAND FOR 0.5 CLIENTS
-//alias vno                "qc_cmd_cl     vno                  ${* ?}" // COMPATIBILITY COMMAND FOR 0.5 CLIENTS
 
 // other aliases for local commands
 alias hud_configure "qc_cmd_cl hud configure"
@@ -232,7 +230,6 @@ alias settemp_restore "qc_cmd_svcl settemp_restore"
 // ===================================
 alias ban                  "qc_cmd_sv     ban                  ${* ?}" // Ban an IP address or a range of addresses (like 1.2.3)
 alias banlist              "qc_cmd_sv     banlist              ${* ?}" // List all existing bans
-alias bans                 "qc_cmd_sv     bans                 ${* ?}" // COMPATIBILITY COMMAND FOR 0.5 CLIENTS
 alias kickban              "qc_cmd_sv     kickban              ${* ?}" // Disconnect a client and ban it at the same time
 alias unban                "qc_cmd_sv     unban                ${* ?}" // Remove an existing ban
 
@@ -266,8 +263,8 @@ set sv_vote_override_mostrecent 0
 alias vmaster   "qc_cmd_cmd vote master"
 alias vlogin    "qc_cmd_cmd vote master login ${* ?}"
 alias vdo       "qc_cmd_cmd vote master do ${* ?}"
-alias vyes      "qc_cmd_cl handlevote yes; cl_cmd vyes" // NOTE: COMPATIBILITY FOR 0.5 IS ADDED HERE WITH "VYES", REMOVE LATER
-alias vno       "qc_cmd_cl handlevote no; cl_cmd vno" // ^^^ same, see above
+alias vyes      "qc_cmd_cl handlevote yes"
+alias vno       "qc_cmd_cl handlevote no"
 alias vdontcare "qc_cmd_cmd vote abstain"
 alias vabstain  "qc_cmd_cmd vote abstain"
 
diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc
index 638b7f996..687c6ae59 100644
--- a/qcsrc/client/command/cl_cmd.qc
+++ b/qcsrc/client/command/cl_cmd.qc
@@ -307,7 +307,6 @@ void LocalCommand_(float request)
 // ==================================
 
 // Normally do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;)
-// but for 0.5 compat, we need vyes and vno here as they were replaced... REMOVE THEM AFTER 0.6 RELEASE!!!!
 #define CLIENT_COMMANDS(request,arguments) \
 	CLIENT_COMMAND("blurtest", LocalCommand_blurtest(request), "Feature for testing blur postprocessing") \
 	CLIENT_COMMAND("debugmodel", LocalCommand_debugmodel(request, arguments), "Spawn a debug model manually") \
@@ -316,8 +315,6 @@ void LocalCommand_(float request)
 	CLIENT_COMMAND("localprint", LocalCommand_localprint(request, arguments), "Create your own centerprint sent to yourself") \
 	CLIENT_COMMAND("mv_download", LocalCommand_mv_download(request, arguments), "Retrieve mapshot picture from the server") \
 	CLIENT_COMMAND("sendcvar", LocalCommand_sendcvar(request, arguments), "Send a cvar to the server (like weaponpriority)") \
-	CLIENT_COMMAND("vyes", LocalCommand_handlevote(request, tokenize_console("handlevote yes")), "") \
-	CLIENT_COMMAND("vno", LocalCommand_handlevote(request, tokenize_console("handlevote no")), "") \
 	/* nothing */
 	
 void LocalCommand_macro_help()