some more fixes

[xonotic/xonotic-data.pk3dir.git] / commands.cfg

diff --git a/commands.cfg b/commands.cfg
index 9f0d3cbf6f10c0a55db56862a9c2bbfaf7da475c..1f7e684588770a6e8554d6c9cc4162daabfe2899 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -259,18 +259,22 @@ set sv_vote_majority_factor_of_voted 0.5 "What percentage of the VOTERS constitu
 // when disabled, don't allow game type changes "note: set these two equal to JUST support simple majorities"
 set sv_vote_override_mostrecent 0
 
-alias vhelp "cmd vote help"
-alias vstatus "cmd vote status"
-alias vcall "cmd vote call ${* ?}"
-alias vstop "cmd vote stop"
-alias vmaster "cmd vote master"
-alias vlogin "cmd vote master login ${* ?}"
-alias vdo "cmd vote master do ${* ?}"
-alias vyes "cl_cmd handlevote yes; cl_cmd vyes" // NOTE: COMPATIBILITY FOR 0.5 IS ADDED HERE WITH "VYES", REMOVE LATER
-alias vno "cl_cmd handlevote no; cl_cmd vno" // ^^^ same, see above
-alias vdontcare "cmd vote abstain"
-alias vabstain "cmd vote abstain"
-
+// aliases for client only
+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 vdontcare "qc_cmd_cmd vote abstain"
+alias vabstain  "qc_cmd_cmd vote abstain"
+
+// aliases for both client and server
+alias vcall     "qc_cmd_svcmd vote call ${* ?}"
+alias vhelp     "qc_cmd_svcmd vote help"
+alias vstatus   "qc_cmd_svcmd vote status"
+alias vstop     "qc_cmd_svcmd vote stop"
+
+// general
 alias vmap "vcall gotomap ${1 ?}"
 alias vnextmap "vcall nextmap ${1 ?}"
 alias vkick "vcall kick ${1 ?}"
@@ -285,10 +289,4 @@ alias vdoend "vdo endmatch"
 //  rcon server commands
 // ======================
 rcon_secure 1
-set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\" movetoauto movetored movetoblue movetoyellow movetopink"
-
-// =============================
-//  other miscellaneous aliases
-// =============================
-alias autoscreenshot "screenshot screenshots/autoscreenshot/${1 !}-${2 !}.jpg; echo \"^5A screenshot has been taken at request of the server.\""
-
+set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\" movetoauto movetored movetoblue movetoyellow movetopink"
\ No newline at end of file