From 6141f8145929f9dc35e131c595079a9dea7a747f Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 7 Mar 2013 11:39:44 +1100 Subject: [PATCH] Also use MSG_MULTI for victory message --- qcsrc/common/notifications.qh | 2 ++ qcsrc/server/mutators/gamemode_td.qc | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index d3e39393c..86a24a4f1 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -341,6 +341,7 @@ void Send_Notification_WOVA( 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"), "") \ MSG_INFO_NOTIF(1, INFO_TD_UPGRADE, 0, 0, "", "", "", _("^F1Turret power increased by 20 percent!\n"), "") \ + MSG_INFO_NOTIF(1, INFO_TD_VICTORY, 1, 0, "s1", "", "", _("^F1%s^F1 victory!\n"), "") \ MSG_INFO_NOTIF(2, INFO_VERSION_BETA, 2, 0, "s1 s2", "", "", _("^F4NOTE: ^BGThe server is running ^F1Xonotic %s (beta)^BG, you have ^F2Xonotic %s\n"), "") \ MSG_INFO_NOTIF(2, INFO_VERSION_OLD, 2, 0, "s1 s2", "", "", _("^F4NOTE: ^BGThe server is running ^F1Xonotic %s^BG, you have ^F2Xonotic %s\n"), "") \ MSG_INFO_NOTIF(2, INFO_VERSION_OUTDATED, 2, 0, "s1 s2", "", "", _("^F4NOTE: ^F1Xonotic %s^BG is out, and you still have ^F2Xonotic %s^BG - get the update from ^F3http://www.xonotic.org/^BG!\n"), "") \ @@ -625,6 +626,7 @@ void Send_Notification_WOVA( 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, MULTI_TD_VICTORY, INFO_TD_VICTORY, CENTER_TD_VICTORY) \ 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 b7c73b98d..f252001ec 100644 --- a/qcsrc/server/mutators/gamemode_td.qc +++ b/qcsrc/server/mutators/gamemode_td.qc @@ -567,7 +567,7 @@ void build_phase() if(head.health <= 0) continue; - print(strcat("Warning: Monster still alive during build phase! Monster name: ", head.netname, "\n")); + dprint(strcat("Warning: Monster still alive during build phase! Monster name: ", head.netname, "\n")); WaypointSprite_Kill(head.sprite); remove(head); @@ -599,12 +599,10 @@ void build_phase() void wave_end(float starting) { - if not(starting) - Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_TD_VICTORY, ((wave_count >= max_waves) ? "Level" : "Wave")); - if not(starting) { - print((wave_count >= max_waves) ? "^2Level victory!\n" : "^2Wave victory!\n"); + Send_Notification(NOTIF_ALL, world, MSG_MULTI, MULTI_TD_VICTORY, ((wave_count >= max_waves) ? "Level" : "Wave")); + if(autocvar_sv_eventlog) GameLogEcho(strcat(":wave:", ftos(wave_count), ":victory")); } -- 2.39.2