From f7134a88fbaaa109a7592bfc96b48a1ff157d4f4 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Sat, 23 Feb 2013 15:30:07 -0500 Subject: [PATCH] Now it compiles :D --- qcsrc/common/notifications.qh | 7 ++++--- qcsrc/server/g_damage.qc | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index c48013368..fdcdbdb10 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -541,6 +541,7 @@ void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, var float autocvar_notification_version = NOTIF_VERSION; var float autocvar_notification_show_sprees = TRUE; var float autocvar_notification_show_sprees_center = TRUE; +var float autocvar_notification_show_sprees_center_specialonly = TRUE; var float autocvar_notification_show_sprees_info = 3; // 0 = off, 1 = target only, 2 = attacker only, 3 = target and attacker var float autocvar_notification_show_sprees_info_newline = TRUE; var float autocvar_notification_show_sprees_info_specialonly = TRUE; @@ -641,7 +642,7 @@ string notif_arg_spree_cen(float spree) _("%d frag spree! "), _("%d score spree! ") ), - spree) + spree); } else { return ""; } // don't show spree information if it isn't an achievement } @@ -649,14 +650,14 @@ string notif_arg_spree_cen(float spree) #undef SPREE_ITEM } - /*else if(spree == -1) // first blood + else if(spree == -1) // first blood { return normal_or_gentle(_("First blood! "), _("First score! ")); } else if(spree == -2) // first victim { return normal_or_gentle(_("First victim! "), _("First casualty! ")); - }*/ + } } #undef SPREE_NEWLINE return ""; diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 9923ef2d0..cd104648f 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -451,7 +451,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) attacker.taunt_soundtime = time + 1; attacker.killcount = attacker.killcount + 1; - #define SPREE_ITEM(counta,countb,normal,gentle) \ + #define SPREE_ITEM(counta,countb,center,normal,gentle) \ case counta: \ { \ AnnounceTo(attacker, strcat(#countb, "kills")); \ -- 2.39.2