From f9c9fc9dc2c32046dbeb8b9dbaae0fdb307ffdc4 Mon Sep 17 00:00:00 2001
From: "Tony J. White" <tjw@tjw.org>
Date: Mon, 23 Oct 2006 17:17:33 +0000
Subject: * (bug 2868) cancel all votes that are in progress when intermission 
  starts (Martin Doucha)

---
 src/game/g_main.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/game')

diff --git a/src/game/g_main.c b/src/game/g_main.c
index 09afa5d2..ee000e8b 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -1430,6 +1430,15 @@ void BeginIntermission( void )
     return;   // already active
 
   level.intermissiontime = level.time;
+
+  // cancel votes
+  level.voteTime = 0;
+  trap_SetConfigstring( CS_VOTE_TIME, "" );
+  level.teamVoteTime[ 0 ] = 0;
+  trap_SetConfigstring( CS_TEAMVOTE_TIME, "" );
+  level.teamVoteTime[ 1 ] = 0;
+  trap_SetConfigstring( CS_TEAMVOTE_TIME + 1, "" );
+
   FindIntermissionPoint( );
 
   // move all clients to the intermission point
-- 
cgit