r6051 - in trunk: data server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-05 08:29:22 -0500 (Thu, 05 Mar 2009)
New Revision: 6051

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/server/server.cfg
Log:
make movetoteam_auto votable, and movetoteam_<color> available to masters and rcon restricted by default


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-03-05 11:19:37 UTC (rev 6050)
+++ trunk/data/defaultNexuiz.cfg	2009-03-05 13:29:22 UTC (rev 6051)
@@ -871,10 +871,10 @@
 bind kp_plus "+userbind 17"
 bind kp_minus "+userbind 18"
 
-set sv_vote_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick cointoss" "these commands can be voted"
+set sv_vote_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick cointoss movetoteam_auto" "these commands can be voted"
 set sv_vote_only_commands ""
-set sv_vote_master_commands ""	"maybe add kickban here (but then sv_vote_master 0)"
-set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\""
+set sv_vote_master_commands "movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink"	"maybe add kickban here (but then sv_vote_master 0)"
+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 sv_vote_call 1	"users can call a vote for the above commands"
 set sv_vote_master 1	"users can call a vote to become master"
 set sv_vote_master_password ""	"when set, users can use \"vlogin PASSWORD\" to log in as master"

Modified: trunk/server/server.cfg
===================================================================
--- trunk/server/server.cfg	2009-03-05 11:19:37 UTC (rev 6050)
+++ trunk/server/server.cfg	2009-03-05 13:29:22 UTC (rev 6051)
@@ -83,9 +83,9 @@
 //g_maplist_votable_abstain 0 // when 1, people get a "don't care" selection in the vote screen
 //g_maplist_votable_nodetail 1 // when 1, people can't see how many voted for what (to thwart abusive "influential" first votes)
 
-//sv_vote_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick" // players can vote for those commands or use them if they are masters. You canm also add 'g_grappling_hook' for hook voting, and 'sv_defaultplayer_fbskin_green sv_defaultplayer_fbskin_red sv_defaultplayer_fbskin_orange sv_defaultplayer_fbskin_off' for fbskin voting.
-//sv_vote_master_commands "" // add commands masters can use if logged in or elected. You may want to put 'kickban' here, so masters can keep out punks. It may be good to also put "sv_status_privacy 0" then...
-//rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\"" // commands for the (stronger) rcon restricted
+//sv_vote_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick cointoss movetoteam_auto" // players can vote for those commands or use them if they are masters. You canm also add 'g_grappling_hook' for hook voting, and 'sv_defaultplayer_fbskin_green sv_defaultplayer_fbskin_red sv_defaultplayer_fbskin_orange sv_defaultplayer_fbskin_off' for fbskin voting.
+//sv_vote_master_commands "movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" // add commands masters can use if logged in or elected. You may want to put 'kickban' here, so masters can keep out punks. It may be good to also put "sv_status_privacy 0" then...
+//rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\" movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" // commands for the (stronger) rcon restricted
 
 //sv_vote_call 1 // 0 will disable the normal voting
 //sv_vote_master 1 // 0 will disable voting to become master, good if you prefer to use the master password instead