respawn ghosts: don't munge colormap

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

diff --git a/commands.cfg b/commands.cfg
index d5ad7830b1a78788f4b593645c7c4e67e6275511..1f7e684588770a6e8554d6c9cc4162daabfe2899 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -229,6 +229,7 @@ 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
 
@@ -243,7 +244,7 @@ set sv_vote_call 1 "Allow users to call a vote for the commands in sv_vote_comma
 set sv_vote_change 1 "Allow voters to change their mind after already voting"
 set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto" "these commands can be voted"
 set sv_vote_only_commands ""
-set sv_vote_master_commands "movetored movetoblue movetoyellow movetopink" "Commands which vote masters can execute by themselves" // maybe add kickban here (but then sv_vote_master 0)
+set sv_vote_master_commands "movetored movetoblue movetoyellow movetopink" "Extra commands which vote masters can execute by themselves, along with the normal sv_vote_commands." // maybe add kickban here (but then sv_vote_master 0)
 set sv_vote_master 1   "Allows the use of the vote master system"
 set sv_vote_master_callable 1 "When set, users can use \"vmaster\" to call a vote to become master of voting commands"
 set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master"
@@ -258,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 login ${* ?}"
-alias vdo "cmd vote do ${* ?}"
-alias vyes "cl_cmd handlevote yes"
-alias vno "cl_cmd handlevote no"
-alias vdontcare "cmd vote dontcare"
-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 ?}"
@@ -284,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