Added Prepare your team announcer

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index ae04b5be15e5b866fda2a185ac58397727cd5101..a8bb43bf8928d00648f54cb62eb7e8ea57177b0e 100644 (file)
--- 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 ffad793a53143af9a2f57b031cbdd1f80f1d2282..d1d2db6181195e3f5a795dac5df16ccf767827b3 100644 (file)
--- 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)