From c6225b8df73519a81ae6e368866d88fdc41c6374 Mon Sep 17 00:00:00 2001 From: z411 Date: Mon, 31 Aug 2020 13:49:57 -0400 Subject: [PATCH] Added Prepare your team announcer --- qcsrc/client/announcer.qc | 10 +++++++--- qcsrc/common/notifications/all.inc | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index ae04b5be1..a8bb43bf8 100644 --- a/qcsrc/client/announcer.qc +++ b/qcsrc/client/announcer.qc @@ -106,9 +106,13 @@ void Announcer_Gamestart() } if(time + 5.0 < startTime) // if connecting to server while restart was active don't always play prepareforbattle - if(time > announcer_countdown.nextthink) // don't play it again if countdown was already going - Local_Notification(MSG_ANNCE, ANNCE_PREPARE); - + if(time > announcer_countdown.nextthink) { // don't play it again if countdown was already going + if(teamplay && warmup_stage) + Local_Notification(MSG_ANNCE, ANNCE_PREPARE_TEAM); + else + Local_Notification(MSG_ANNCE, ANNCE_PREPARE); + } + announcer_countdown.nextthink = startTime - floor(startTime - time); //synchronize nextthink to startTime } } diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc index ffad793a5..d1d2db618 100644 --- a/qcsrc/common/notifications/all.inc +++ b/qcsrc/common/notifications/all.inc @@ -194,6 +194,7 @@ MSG_ANNCE_NOTIF(NUM_ROUNDSTART_10, N___NEVER, "10", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) MSG_ANNCE_NOTIF(PREPARE, N__ALWAYS, "prepareforbattle", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) + MSG_ANNCE_NOTIF(PREPARE_TEAM, N__ALWAYS, "prepareyourteam", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) MSG_ANNCE_NOTIF(REMAINING_FRAG_1, N_GNTLOFF, "1fragleft", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) MSG_ANNCE_NOTIF(REMAINING_FRAG_2, N_GNTLOFF, "2fragsleft", CH_INFO, VOL_BASEVOICE, ATTEN_NONE) -- 2.39.2