r5932 - in trunk/data: . qcsrc/server

[esteel at icculus.org]

Author: esteel
Date: 2009-02-23 09:15:27 -0500 (Mon, 23 Feb 2009)
New Revision: 5932

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/vote.qc
Log:
added sv_vote_stop, the amount of time till one can vote again after stopping ones own vote.  There was some abuse of the current unlimited vcall/vstop..\

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-02-23 13:45:17 UTC (rev 5931)
+++ trunk/data/defaultNexuiz.cfg	2009-02-23 14:15:27 UTC (rev 5932)
@@ -879,11 +879,12 @@
 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_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 \"vdo login (password)\" to log in as master"
+set sv_vote_master_password ""	"when set, users can use \"vlogin PASSWORD\" to log in as master"
 set sv_vote_change 0	"set to 1 to allow to change you vote/mind"
 set sv_vote_singlecount 0	"set to 1 to count votes once after timeout or to 0 to count with every vote"
 set sv_vote_timeout 60	"a vote will timeout after this many seconds"
-set sv_vote_wait 120	"a player can not call a vote again for this many seconds"
+set sv_vote_wait 120	"a player can not call a vote again for this many seconds when his vote was not accepted"
+set sv_vote_stop 15	"a player can not call a vote again for this many seconds when he stopped this vote (e.g. to correct it)"
 set sv_vote_majority_factor 0.5	"which quotient of the PLAYERS constitute a majority? (try: 0.667, 0.75 when using the above)"
 set sv_vote_simple_majority_factor 0	"which quotient of the VOTERS constitute a majority too? (0 = off, otherwise it must be higher than or equal to sv_vote_majority_factor)"
 // when disabled, don't allow game type changes "note: set these two equal to JUST support simple majorities"

Modified: trunk/data/qcsrc/server/vote.qc
===================================================================
--- trunk/data/qcsrc/server/vote.qc	2009-02-23 13:45:17 UTC (rev 5931)
+++ trunk/data/qcsrc/server/vote.qc	2009-02-23 14:15:27 UTC (rev 5932)
@@ -497,7 +497,7 @@
 	if(stopper == votecaller) {
 		// no wait for next vote so you can correct your vote
 		if(votecaller) {
-			votecaller.vote_next = 0;
+			votecaller.vote_next = time + cvar("sv_vote_stop");;
 		}
 	}
 	VoteReset();