summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorTony J. White <tjw@tjw.org>2006-10-23 17:17:33 +0000
committerTony J. White <tjw@tjw.org>2006-10-23 17:17:33 +0000
commitf9c9fc9dc2c32046dbeb8b9dbaae0fdb307ffdc4 (patch)
treec8e10edde2779aab9dd1bcfc591e54c3425f26f0 /src/game
parenta6f9b56ecea9a30c2c58d08ae289bfdd3f157260 (diff)
* (bug 2868) cancel all votes that are in progress when intermission
starts (Martin Doucha)
Diffstat (limited to 'src/game')
-rw-r--r--src/game/g_main.c9
1 files changed, 9 insertions, 0 deletions
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