From 90a164d5d7e5c29c196fa54c451b75e8e93cf48b Mon Sep 17 00:00:00 2001 From: esteel Date: Mon, 23 Feb 2009 14:15:27 +0000 Subject: [PATCH] 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..\ git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5932 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 5 +++-- data/qcsrc/server/vote.qc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index 8216a0eb4..0d0fb84bd 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -879,11 +879,12 @@ set sv_vote_master_commands "" "maybe add kickban here (but then sv_vote_master 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" diff --git a/data/qcsrc/server/vote.qc b/data/qcsrc/server/vote.qc index 9b35025c1..59c01ec87 100644 --- a/data/qcsrc/server/vote.qc +++ b/data/qcsrc/server/vote.qc @@ -497,7 +497,7 @@ void VoteStop(entity stopper) { 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(); -- 2.39.2