From: Mario <mario.mario@y7mail.com>
Date: Sat, 20 Jul 2013 08:47:01 +0000 (+1000)
Subject: Time out after 30 seconds if no-one readied up
X-Git-Tag: xonotic-v0.8.0~241^2^2~178
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f8bfc908808a892396d44104bf922e01b5e154ef;p=xonotic%2Fxonotic-data.pk3dir.git

Time out after 30 seconds if no-one readied up
---

diff --git a/qcsrc/server/mutators/gamemode_towerdefense.qc b/qcsrc/server/mutators/gamemode_towerdefense.qc
index 9ee912eb2..b3a4cfee9 100644
--- a/qcsrc/server/mutators/gamemode_towerdefense.qc
+++ b/qcsrc/server/mutators/gamemode_towerdefense.qc
@@ -471,7 +471,7 @@ float TD_CheckTeams()
 	ready_needed_factor = bound(0.5, cvar("g_td_majority_factor"), 0.999);
 	ready_needed_count = floor(num_players * ready_needed_factor) + 1;
 	
-	if(readycount >= ready_needed_count)
+	if(readycount >= ready_needed_count || time >= ready_timeout)
 		return TRUE;
 	
 	allowed_to_spawn = TRUE;
@@ -576,6 +576,8 @@ void td_Initialize()
 	
 	readyrestart_happened = TRUE; // disable normal ready command
 	
+	ready_timeout = time + 30;
+	
 	round_handler_Spawn(TD_CheckTeams, TD_CheckWinner, TD_RoundStart);
 	round_handler_Init(5, 10, 180);
 }
diff --git a/qcsrc/server/mutators/gamemode_towerdefense.qh b/qcsrc/server/mutators/gamemode_towerdefense.qh
index 337b3f8bf..a37958f51 100644
--- a/qcsrc/server/mutators/gamemode_towerdefense.qh
+++ b/qcsrc/server/mutators/gamemode_towerdefense.qh
@@ -25,4 +25,6 @@ float last_check;
 .float turret_cnt;
 
 .float level;
-.float last_trace;
\ No newline at end of file
+.float last_trace;
+
+float ready_timeout;