summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony J. White <tjw@tjw.org>2007-02-06 04:21:50 +0000
committerTony J. White <tjw@tjw.org>2007-02-06 04:21:50 +0000
commitb3cbb5af2a304acb77aaee3884b461b589098e93 (patch)
tree299b8fd9889809ecc554ac37a1f5fb5c71fc8fd3
parent2df9b984a1f73ec54cb546e3f57707ec22468392 (diff)
* (bug 3020) put a 1 minute maximum on intermission time to prevent infinite
intermissions when only afk or malicious players are on the non-spec teams.
-rw-r--r--src/game/g_main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/game/g_main.c b/src/game/g_main.c
index 16b40c0c..6a217bdc 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -1779,6 +1779,13 @@ void CheckIntermissionExit( void )
if( level.time < level.intermissiontime + 5000 )
return;
+ // never let intermission go on for over 1 minute
+ if( level.time > level.intermissiontime + 60000 )
+ {
+ ExitLevel( );
+ return;
+ }
+
// if nobody wants to go, clear timer
if( !ready && numPlayers )
{