Add waypoint editor quickmenu entry in the default quickmenu if waypoint editor is...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / announcer.qc

diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc
index 1bbf900375e025f66f059202f7eae6c5b826b50d..e86702afa086a8314ee12ba92540f605929a6b7d 100644 (file)
--- a/qcsrc/client/announcer.qc
+++ b/qcsrc/client/announcer.qc
@@ -1,9 +1,13 @@
 #include "announcer.qh"
 
+#include <client/draw.qh>
 #include <client/hud/panel/centerprint.qh>
+#include <client/hud/panel/scoreboard.qh>
 #include <client/mutators/_mod.qh>
 #include <common/notifications/all.qh>
 #include <common/stats.qh>
+#include <common/mapinfo.qh>
+#include <common/ent_cs.qh>
 
 bool announcer_1min;
 bool announcer_5min;
@@ -17,6 +21,38 @@ string AnnouncerOption()
 
 entity announcer_countdown;
 
+/**
+ * Displays duel title; updates it if the players in-game have changed.
+ */
+string prev_pl1_name;
+string prev_pl2_name;
+void Announcer_Duel()
+{
+       Scoreboard_UpdatePlayerTeams();
+
+       entity pl1 = players.sort_next;
+       entity pl2 = pl1.sort_next;
+       string pl1_name = (pl1 && pl1.team != NUM_SPECTATOR ? entcs_GetName(pl1.sv_entnum) : "???");
+       string pl2_name = (pl2 && pl2.team != NUM_SPECTATOR ? entcs_GetName(pl2.sv_entnum) : "???");
+
+       if(pl1_name == prev_pl1_name && pl2_name == prev_pl2_name)
+               return; // Players haven't changed, stop here
+
+       strcpy(prev_pl1_name, pl1_name);
+       strcpy(prev_pl2_name, pl2_name);
+
+       // There are new duelers, update title
+       centerprint_SetDuelTitle(pl1_name, pl2_name, _("vs"));
+}
+
+void Announcer_ClearTitle()
+{
+       strfree(prev_pl1_name);
+       strfree(prev_pl2_name);
+       centerprint_ClearTitle();
+}
+
+bool prev_inround;
 void Announcer_Countdown(entity this)
 {
        float starttime = STAT(GAMESTARTTIME);
@@ -26,6 +62,7 @@ void Announcer_Countdown(entity this)
                Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTOP);
                delete(this);
                announcer_countdown = NULL;
+               Announcer_ClearTitle();
                return;
        }
 
@@ -39,13 +76,15 @@ void Announcer_Countdown(entity this)
                Local_Notification(MSG_MULTI, MULTI_COUNTDOWN_BEGIN);
                delete(this);
                announcer_countdown = NULL;
+               Announcer_ClearTitle();
                return;
        }
        else // countdown is still going
        {
                if(inround)
                {
-                       Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, countdown_rounded);
+                       if(!prev_inround) Announcer_ClearTitle(); // clear title if we just started the match
+                       Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_ROUNDSTART, STAT(ROUNDS_PLAYED) + 1, countdown_rounded);
                        Notification annce_num = Announcer_PickNumber(CNT_ROUNDSTART, countdown_rounded);
                        if(annce_num != NULL)
                                Local_Notification(MSG_ANNCE, annce_num);
@@ -60,6 +99,8 @@ void Announcer_Countdown(entity this)
                        this.nextthink = (starttime - (countdown - 1));
                }
        }
+
+       prev_inround = inround;
 }
 
 /**
@@ -69,7 +110,7 @@ void Announcer_Countdown(entity this)
  * timelimit, fraglimit and game_starttime! Requires engine changes (remove STAT_TIMELIMIT
  * and STAT_FRAGLIMIT to be auto-sent)
  */
- float previous_game_starttime;
+float previous_game_starttime;
 void Announcer_Gamestart()
 {
        float startTime = STAT(GAMESTARTTIME);
@@ -90,6 +131,9 @@ void Announcer_Gamestart()
                return;
        }
 
+       if(announcer_countdown && gametype.m_1v1)
+               Announcer_Duel();
+
        if(previous_game_starttime != startTime)
        {
                if(time < startTime)
@@ -100,9 +144,16 @@ void Announcer_Gamestart()
                                setthink(announcer_countdown, Announcer_Countdown);
                        }
 
-                       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(!warmup_stage && time < STAT(GAMESTARTTIME))
+                       {
+                               if (gametype.m_1v1)
+                                       Announcer_Duel();
+                               else
+                                       centerprint_SetTitle(strcat("^BG", MapInfo_Type_ToText(gametype))); // Show game type as title
+
+                               if(time + 5.0 < startTime) // if connecting to server while restart was active don't always play prepareforbattle
+                                       Local_Notification(MSG_ANNCE, ANNCE_PREPARE);
+                       }
 
                        announcer_countdown.nextthink = startTime - floor(startTime - time + 0.5); //synchronize nextthink to startTime
                }