From 32c4c039d8cdaac9b8c51233ba51af32fd7425c4 Mon Sep 17 00:00:00 2001 From: terencehill Date: Thu, 8 Dec 2016 17:54:58 +0100 Subject: [PATCH] Key Hunt: when warmup ends kill the "missing teams" message and start the round start countdown --- qcsrc/server/mutators/mutator/gamemode_keyhunt.qc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc index 529a912f6..d1337482b 100644 --- a/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc +++ b/qcsrc/server/mutators/mutator/gamemode_keyhunt.qc @@ -865,13 +865,16 @@ int kh_GetMissingTeams() void kh_WaitForPlayers() // delay start of the round until enough players are present { + static int prev_missing_teams_mask; if(time < game_starttime) { + if (prev_missing_teams_mask > 0) + Kill_Notification(NOTIF_ALL, NULL, MSG_CENTER, CPID_MISSING_TEAMS); + prev_missing_teams_mask = -1; kh_Controller_SetThink(game_starttime - time + 0.1, kh_WaitForPlayers); return; } - static int prev_missing_teams_mask; int missing_teams_mask = kh_GetMissingTeams(); if(!missing_teams_mask) { @@ -1314,5 +1317,5 @@ MUTATOR_HOOKFUNCTION(kh, DropSpecialItems) MUTATOR_HOOKFUNCTION(kh, reset_map_global) { - kh_Controller_SetThink(autocvar_g_balance_keyhunt_delay_round + (game_starttime - time), kh_StartRound); + kh_WaitForPlayers(); // takes care of killing the "missing teams" message } -- 2.39.2