From: Samual <samual@xonotic.org>
Date: Sat, 17 Dec 2011 17:26:19 +0000 (-0500)
Subject: Synchronize server.cfg settings with commands.cfg
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~116
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a157d42e23b0ed0a602d6a074dc56be0176b255b;p=xonotic%2Fxonotic-data.pk3dir.git

Synchronize server.cfg settings with commands.cfg
---

diff --git a/commands.cfg b/commands.cfg
index b75030490..4bfd5087f 100644
--- a/commands.cfg
+++ b/commands.cfg
@@ -222,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"
@@ -264,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"