From c62a8010ce4cfc8ef8b107be5544ba58335b8967 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Tue, 26 Feb 2013 16:40:34 -0500 Subject: [PATCH] unify gamestart messages more --- qcsrc/client/announcer.qc | 6 +++--- qcsrc/common/notifications.qh | 6 ++++-- qcsrc/server/arena.qc | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/qcsrc/client/announcer.qc b/qcsrc/client/announcer.qc index ce7077e43..240d424c6 100644 --- a/qcsrc/client/announcer.qc +++ b/qcsrc/client/announcer.qc @@ -27,8 +27,8 @@ void Announcer_Countdown() if(countdown <= 0) // countdown has finished, starttime is now { - if (!spectatee_status) - centerprint_generic(CPID_GAME_STARTING, _("^1Begin!"), 1, 0); + if (!spectatee_status) + Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_BEGIN); Announcer_Play("begin"); announcer_5min = announcer_1min = FALSE; // reset maptime announcers now as well @@ -38,7 +38,7 @@ void Announcer_Countdown() else // countdown is still going { if (!spectatee_status) - centerprint_generic(CPID_GAME_STARTING, _("^1Game starts in %d seconds"), 1, countdown_rounded); + Local_Notification(MSG_CENTER, CENTER_COUNTDOWN_GAMESTART, countdown_rounded); if(countdown_rounded <= 3 && countdown_rounded >= 1) Announcer_Play(ftos(countdown_rounded)); diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index b35e8aa68..7d06dc6fa 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -318,9 +318,11 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, /*MSG_CENTER_NOTIF(1, CENTER_EMPTY, 0, 0, "", NO_CPID, "0 0", "null", "")*/ \ MSG_CENTER_NOTIF(1, CENTER_ASSAULT_ATTACKING, 0, 0, "", CPID_ASSAULT_ROLE, "0 0", _("^BGYou are attacking!"), "") \ MSG_CENTER_NOTIF(1, CENTER_ASSAULT_DEFENDING, 0, 0, "", CPID_ASSAULT_ROLE, "0 0", _("^BGYou are defending!"), "") \ + MSG_CENTER_NOTIF(1, CENTER_ARENA_BEGIN, 0, 0, "", CPID_ARENA, "2 0", _("^F4Begin!"), "") \ MSG_CENTER_NOTIF(1, CENTER_ARENA_NEEDPLAYER, 0, 0, "", CPID_ARENA, "2 0", _("^BGNeed at least 1 player in each team to play Clan Arena!"), "") \ - MSG_CENTER_NOTIF(1, CENTER_ARENA_ROUNDSTART, 0, 1, "", CPID_ARENA, "1 f1", _("^BGRound will start in ^COUNT"), "") \ - MSG_CENTER_NOTIF(1, CENTER_BEGIN, 0, 0, "", NO_CPID, "2 0", _("^F4Begin!"), "") \ + MSG_CENTER_NOTIF(1, CENTER_ARENA_ROUNDSTART, 0, 1, "", CPID_ARENA, "1 f1", _("^F4Round will start in ^COUNT"), "") \ + MSG_CENTER_NOTIF(1, CENTER_COUNTDOWN_BEGIN, 0, 0, "", CPID_GAMESTART, "2 0", _("^F4Begin!"), "") \ + MSG_CENTER_NOTIF(1, CENTER_COUNTDOWN_GAMESTART, 0, 1, "", CPID_GAMESTART, "1 f1", _("^F4Game starts in ^COUNT"), "") \ MSG_CENTER_NOTIF(1, CENTER_CTF_CAPTURESHIELD_SHIELDED, 0, 0, "", CPID_CTF_CAPSHIELD, "0 0", _("^BGYou are now ^F1shielded^BG from the flag\n^BGfor ^F2too many unsuccessful attempts^BG to capture.\n^BGMake some defensive scores before trying again."), "") \ MSG_CENTER_NOTIF(1, CENTER_CTF_CAPTURESHIELD_FREE, 0, 0, "", CPID_CTF_CAPSHIELD, "0 0", _("^BGYou are now free.\n^BGFeel free to ^F2try to capture^BG the flag again\n^BGif you think you will succeed."), "") \ MULTITEAM_CENTER(1, CENTER_CTF_PASS_OTHER_, 2, 2, 0, "s1 s2", CPID_CTF_PASS, "0 0", _("^BG%s^BG passed the ^TC^TT^BG flag to %s"), "") \ diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc index 58b9c9bd1..96250923e 100644 --- a/qcsrc/server/arena.qc +++ b/qcsrc/server/arena.qc @@ -268,7 +268,7 @@ void Arena_Warmup() reset_map(TRUE); } else { Announce("begin"); - Send_Notification(NOTIF_ANY, world, MSG_CENTER, CENTER_BEGIN); + Send_Notification(NOTIF_ANY, world, MSG_CENTER, CENTER_ARENA_BEGIN); } if(g_arena) { -- 2.39.2