From 305434dfe9b7b9527669521e8a245d4f6cdabdb0 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 12 Feb 2008 16:36:10 +0000 Subject: [PATCH] fix minor bug in VoteSpam git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3359 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/clientcommands.qc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/server/clientcommands.qc b/data/qcsrc/server/clientcommands.qc index 85533bcfb..b04fa564e 100644 --- a/data/qcsrc/server/clientcommands.qc +++ b/data/qcsrc/server/clientcommands.qc @@ -770,16 +770,21 @@ void VoteCount() { } else if(time > votefinished) { - VoteSpam(yescount, nocount, abstaincount, playercount - yescount - nocount - abstaincount, floor((yescount + nocount) * votefactor) + 1); if(cvar("sv_vote_simple_majority")) + { + VoteSpam(yescount, nocount, abstaincount, playercount - yescount - nocount - abstaincount, floor((yescount + nocount) * votefactor) + 1); if(yescount > (yescount + nocount) * votefactor) VoteAccept(); else if(yescount + nocount > 0) VoteReject(); else VoteTimeout(); + } else + { + VoteSpam(yescount, nocount, abstaincount, playercount - yescount - nocount - abstaincount, floor((playercount - abstaincount) * votefactor) + 1); VoteTimeout(); + } } } } -- 2.39.2