From aaaba4f4039f3643d1a040dfe1c9715be49371e2 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Thu, 25 Sep 2008 12:23:44 +0000 Subject: continued on the voting --- src/game/server/gamecontext.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/game/server/gamecontext.cpp') diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index f896a140..ca335896 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -264,7 +264,7 @@ void GAMECONTEXT::send_vote_status(int cid) msg.total++; if(players[i]->vote > 0) msg.yes++; - else if(players[i]->vote > 0) + else if(players[i]->vote < 0) msg.no++; else msg.pass++; @@ -302,18 +302,22 @@ void GAMECONTEXT::tick() total++; if(players[i]->vote > 0) yes++; - else if(players[i]->vote > 0) + else if(players[i]->vote < 0) no++; } } - if(yes > (total+1)/2) + if(yes >= (total+1)/2) { console_execute_line(vote_command); vote_closetime = 0; + send_chat(-1, GAMECONTEXT::CHAT_ALL, "Vote passed"); } - else if(time_get() > vote_closetime || no > (total+1)/2) + else if(time_get() > vote_closetime || no >= (total+1)/2) + { + send_chat(-1, GAMECONTEXT::CHAT_ALL, "Vote failed"); vote_closetime = 0; + } } } -- cgit 1.4.1