Synchronize server.cfg settings with commands.cfg

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

diff --git a/commands.cfg b/commands.cfg
index f3654833262fc515661795f1acc15581639dfcbf..4bfd5087f1fd469d47d8b77314a80b498e6981df 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -58,11 +58,11 @@ alias addvote "qc_cmd addtolist sv_vote_commands ${* ?}"
 alias bsp "ls maps/*.bsp"
 alias chmap "changelevel ${* ?}"
 alias clearmap "disconnect"
-alias rec "record demos/${1 !}"
 alias ply "playdemo $1"
-alias tdem "timedemo $1"
+alias rec "record demos/${1 !}"
 alias sv_loadconfig "exec $serverconfig"
 alias sv_restart "say \"Server will restart at the end of the match, you will all be reconnected automatically. ${* ?} \"; quit_and_redirect self"
+alias tdem "timedemo $1"
 
 
 // ===============================================
@@ -110,10 +110,11 @@ set sv_clientcommand_antispam_count 5 "Amount of commands considered spam before
 seta sv_status_privacy 1 "hide IP addresses from \"status\" and \"who\" replies shown to clients"
 seta cl_autoswitch 1 "automatically switch to newly picked up weapons if they are better than what you are carrying"
 
+// commented out commands are really only intended for internal use, or already have declaration in the engine
 alias autoswitch "cmd autoswitch ${* ?}"
 alias checkfail "cmd checkfail ${* ?}"
 alias clientversion "cmd clientversion ${* ?}"
-alias getmapvotepic "cmd getmapvotepic ${* ?}"
+//alias getmapvotepic "cmd getmapvotepic ${* ?}"
 alias join "cmd join"
 alias ready "cmd ready"
 alias records "cmd records"
@@ -186,11 +187,11 @@ alias savedb "sv_cmd database save \"${1 ?}\""
 alias dumpdb "sv_cmd database dump \"${1 ?}\""
 alias loaddb "sv_cmd database load \"${1 ?}\""
 
-alias movetoteam_red "moveplayer ${1 ?} red"
-alias movetoteam_blue "moveplayer ${1 ?} blue"
-alias movetoteam_pink "moveplayer ${1 ?} pink"
-alias movetoteam_yellow "moveplayer ${1 ?} yellow"
-alias movetoteam_auto "moveplayer ${1 ?} auto"
+alias movetored "moveplayer ${1 ?} red"
+alias movetoblue "moveplayer ${1 ?} blue"
+alias movetopink "moveplayer ${1 ?} pink"
+alias movetoyellow "moveplayer ${1 ?} yellow"
+alias movetoauto "moveplayer ${1 ?} auto"
 
 
 // =======================================================
@@ -221,9 +222,9 @@ alias unban "sv_cmd unban ${* ?}"     // usage: unban 3 (number from bans)
 // =================================
 set sv_vote_call 1 "Allow users to call a vote for the commands in sv_vote_commands"
 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 movetoteam_auto" "these commands can be voted"
+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 "movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" "maybe add kickban here (but then sv_vote_master 0)"
+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 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"
@@ -263,4 +264,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\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink"
+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"