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 9ee912eb2edc16293a0938ef2895fd6863fb1b40..b3a4cfee9c3969263cb3c3d12785bace914852e1 100644 (file)
--- 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 337b3f8bfda547fd9bbe87ef5a8d0b0409106b83..a37958f513ae1220a26180daeef14068c3de0c95 100644 (file)
--- 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;