Use MSG_MULTI for phase messages

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 563426e6bdd6a10f23fde2d9bdda2c5bec866e62..d3e39393c85fe65f203b3e162f0c5af2ef93c746 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -335,6 +335,8 @@ void Send_Notification_WOVA(
        MSG_INFO_NOTIF(1, INFO_TD_NOFUEL,                          0, 0, "", "",                            "",                     _("^K1You don't have enough fuel to spawn that turret\n"), "") \
        MSG_INFO_NOTIF(1, INFO_TD_NOFUEL_REPAIR,                   0, 1, "f1", "",                          "",                         _("^K1You need %s fuel to repair this turret\n"), "") \
        MSG_INFO_NOTIF(1, INFO_TD_NOFUEL_UPGRADE,              0, 1, "f1", "",                          "",                     _("^K1You need %s fuel to increase this turret's power\n"), "") \
+       MSG_INFO_NOTIF(1, INFO_TD_PHASE_BUILD,                     1, 0, "s1", "",                          "",                     _("^BG%s\n"), "") \
+       MSG_INFO_NOTIF(1, INFO_TD_PHASE_COMBAT,                    0, 0, "", "",                            "",                     _("^K1Combat phase!\n"), "") \
        MSG_INFO_NOTIF(1, INFO_TD_REMOVE,                          0, 0, "", "",                            "",                     _("^BGTurret removed\n"), "") \
        MSG_INFO_NOTIF(1, INFO_TD_REPAIR,                          0, 0, "", "",                            "",                     _("^F1Turret repaired by 100 health points!\n"), "") \
        MSG_INFO_NOTIF(1, INFO_TD_SPAWN,                                   0, 0, "", "",                            "",                     _("^BGYou spawned a turret\n"), "") \
@@ -621,6 +623,8 @@ void Send_Notification_WOVA(
        MSG_MULTI_NOTIF(1, ITEM_WEAPON_PRIMORSEC,                INFO_ITEM_WEAPON_PRIMORSEC,                CENTER_ITEM_WEAPON_PRIMORSEC) \
        MSG_MULTI_NOTIF(1, ITEM_WEAPON_UNAVAILABLE,              INFO_ITEM_WEAPON_UNAVAILABLE,              CENTER_ITEM_WEAPON_UNAVAILABLE) \
        MSG_MULTI_NOTIF(1, MULTI_TD_GENDESTROYED,                INFO_TD_GENDESTROYED,                                  CENTER_TD_GENDESTROYED) \
+       MSG_MULTI_NOTIF(1, MULTI_TD_PHASE_BUILD,                 INFO_TD_PHASE_BUILD,                                   CENTER_TD_PHASE_BUILD) \
+       MSG_MULTI_NOTIF(1, MULTI_TD_PHASE_COMBAT,                INFO_TD_PHASE_COMBAT,                                  CENTER_TD_PHASE_COMBAT) \
        MSG_MULTI_NOTIF(1, WEAPON_ACCORDEON_MURDER,              INFO_WEAPON_ACCORDEON_MURDER,              NO_MSG) \
        MSG_MULTI_NOTIF(1, WEAPON_ACCORDEON_SUICIDE,             INFO_WEAPON_ACCORDEON_SUICIDE,             CENTER_DEATH_SELF_GENERIC) \
        MSG_MULTI_NOTIF(1, WEAPON_CRYLINK_MURDER,                INFO_WEAPON_CRYLINK_MURDER,                NO_MSG) \

diff --git a/qcsrc/server/mutators/gamemode_td.qc b/qcsrc/server/mutators/gamemode_td.qc
index b5baabaf9b7242d1a5df601b612ffb11619d68e0..b7c73b98dbb923a87c34a20ab29637aec91544b2 100644 (file)
--- a/qcsrc/server/mutators/gamemode_td.qc
+++ b/qcsrc/server/mutators/gamemode_td.qc
@@ -469,9 +469,7 @@ void combat_phase_begin()
        monster_count = totalmonsters;
        entity gen;
        
-       print("^1Combat phase!\n");
-       
-       Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_TD_PHASE_COMBAT);
+       Send_Notification(NOTIF_ALL, world, MSG_MULTI, MULTI_TD_PHASE_COMBAT);
        
        if(autocvar_sv_eventlog)
                GameLogEcho(":combatphase");
@@ -553,7 +551,7 @@ void build_phase()
     startmsg = strcat("Wave starts in ", ftos(autocvar_g_td_buildphase_time), " seconds");
        mainmsg = strcat(buildmsg, healmsg, countmsg, startmsg);
        
-       Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_TD_PHASE_BUILD, mainmsg);
+       Send_Notification(NOTIF_ALL, world, MSG_MULTI, MULTI_TD_PHASE_BUILD, mainmsg);
        
        FOR_EACH_PLAYER(head) 
     {
@@ -587,8 +585,6 @@ void build_phase()
        
        monsters_total = totalmonsters;
        monsters_killed = 0;
-       
-       print(strcat(buildmsg, healmsg, countmsg, startmsg, "\n"));
                
        queue_monsters(totalmonsters);