From c54d93af8df0be308d554e7c1921953ff4dd0401 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sun, 2 Mar 2014 00:18:38 +0100 Subject: [PATCH] Migrate remaining CA messages to the notification system --- qcsrc/common/notifications.qh | 2 ++ qcsrc/server/command/cmd.qc | 2 +- qcsrc/server/mutators/gamemode_ca.qc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index 062d2080df..17422ccede 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -429,6 +429,8 @@ void Send_Notification_WOCOVA( MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VH_WAKI_ROCKET, 2, 1, "s1 s2loc spree_lost", "s1", "notify_death", _("^BG%s^K1 couldn't find shelter from a Racer rocket%s%s"), "") \ MSG_INFO_NOTIF(1, INFO_DEATH_SELF_VOID, 2, 1, "s1 s2loc spree_lost", "s1", "notify_void", _("^BG%s^K1 was in the wrong place%s%s"), "") \ MULTITEAM_INFO(1, INFO_DEATH_TEAMKILL_, 4, 3, 1, "s1 s2 s3loc spree_end", "s2 s1", "notify_teamkill_%s", _("^BG%s^K1 was betrayed by ^BG%s^K1%s%s"), "") \ + MSG_INFO_NOTIF(1, INFO_CA_JOIN_LATE, 0, 0, "", "", "", _("^F1Round already started, you will join the game in the next round"), "") \ + MSG_INFO_NOTIF(1, INFO_CA_LEAVE, 0, 0, "", "", "", _("^F2You will spectate in the next round"), "") \ MSG_INFO_NOTIF(1, INFO_FREEZETAG_FREEZE, 2, 0, "s1 s2", "", "", _("^BG%s^K1 was frozen by ^BG%s"), "") \ MSG_INFO_NOTIF(1, INFO_FREEZETAG_REVIVED, 2, 0, "s1 s2", "", "", _("^BG%s^K3 was revived by ^BG%s"), "") \ MSG_INFO_NOTIF(1, INFO_FREEZETAG_REVIVED_FALL, 1, 0, "s1", "", "", _("^BG%s^K3 was revived by falling"), "") \ diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc index 40f7ed406c..df6872d36c 100644 --- a/qcsrc/server/command/cmd.qc +++ b/qcsrc/server/command/cmd.qc @@ -578,7 +578,7 @@ void ClientCommand_spectate(float request) if((IS_PLAYER(self) || self.caplayer) && autocvar_sv_spectate == 1) { if(self.caplayer && (IS_SPEC(self) || IS_OBSERVER(self))) - sprint(self, "WARNING: you will spectate in the next round.\n"); + Send_Notification(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_CA_LEAVE); ClientKill_TeamChange(-2); // observe } } diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc index 5236889adc..76419d8387 100644 --- a/qcsrc/server/mutators/gamemode_ca.qc +++ b/qcsrc/server/mutators/gamemode_ca.qc @@ -153,7 +153,7 @@ MUTATOR_HOOKFUNCTION(ca_PutClientInServer) { self.caplayer = 0.5; if(IS_REAL_CLIENT(self)) - sprint(self, "You will join the game in the next round.\n"); + Send_Notification(NOTIF_ONE_ONLY, self, MSG_INFO, INFO_CA_JOIN_LATE); } } return 1; -- 2.39.2