From a50c735d6073f9726549c4e44720eda897bdce4b Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 27 Mar 2007 14:00:52 +0000 Subject: [PATCH] // a simple majority suffices to accept a vote (meaning: YES votes > NO votes; otherwise: YES votes > half of the players) set sv_vote_simple_majority 0 git-svn-id: svn://svn.icculus.org/nexuiz/trunk/data@2258 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- default.cfg | 2 ++ qcsrc/server/clientcommands.qc | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/default.cfg b/default.cfg index 0f7d57790..2d84c4da0 100644 --- a/default.cfg +++ b/default.cfg @@ -696,6 +696,8 @@ set sv_vote_singlecount 0 set sv_vote_timeout 60 // a player can not call a vote again for this many seconds set sv_vote_wait 120 +// a simple majority suffices to accept a vote (meaning: YES votes > NO votes; otherwise: YES votes > half of the players) +set sv_vote_simple_majority 0 alias vhelp "cmd vote help" alias vstatus "cmd vote status" alias vcall "cmd vote call $*" diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc index 1edea793c..898b322c3 100644 --- a/qcsrc/server/clientcommands.qc +++ b/qcsrc/server/clientcommands.qc @@ -523,7 +523,15 @@ void VoteCount() { } else if((playercount / 2) < nocount) { // vote rejected VoteReject(); } else if(time > votefinished) { // vote timedout - VoteTimeout(); + if(cvar("sv_vote_simple_majority")) + if(yescount > nocount) + VoteAccept(); + else if(nocount > yescount) + VoteReject(); + else + VoteTimeout(); + else + VoteTimeout(); } // else still running } -- 2.39.2