From f30018432d1588f1c1b2d519f4a0ac69825842e6 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Mon, 25 Feb 2013 16:11:28 -0500 Subject: [PATCH] Other updates --- qcsrc/common/notifications.qh | 4 ++-- qcsrc/server/g_damage.qc | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh index 5ed7fd426..6b0c5f40c 100644 --- a/qcsrc/common/notifications.qh +++ b/qcsrc/common/notifications.qh @@ -610,8 +610,8 @@ string arg_slot[NOTIF_MAX_ARGS]; ARG_CASE(ARG_CS_SV_HA, "s2", s2) \ ARG_CASE(ARG_CS_SV_HA, "s3", s3) \ ARG_CASE(ARG_CS_SV_HA, "s4", s4) \ - ARG_CASE(ARG_CS_SV, "s2loc", (autocvar_notification_show_location ? sprintf( ( ((tmp_s = autocvar_notification_show_location_string) != "") ? tmp_s : _(" (near %s)") ), s2) : "")) \ - ARG_CASE(ARG_CS_SV, "s3loc", (autocvar_notification_show_location ? sprintf( ( ((tmp_s = autocvar_notification_show_location_string) != "") ? tmp_s : _(" (near %s)") ), s3) : "")) \ + ARG_CASE(ARG_CS_SV, "s2loc", (autocvar_notification_show_location ? sprintf(( ((tmp_s = autocvar_notification_show_location_string) != "") ? tmp_s : _(" (near %s)") ), s2) : "")) \ + ARG_CASE(ARG_CS_SV, "s3loc", (autocvar_notification_show_location ? sprintf(( ((tmp_s = autocvar_notification_show_location_string) != "") ? tmp_s : _(" (near %s)") ), s3) : "")) \ ARG_CASE(ARG_CS_SV_DC, "f1", ftos(f1)) \ ARG_CASE(ARG_CS_SV_DC, "f2", ftos(f2)) \ ARG_CASE(ARG_CS_SV, "f3", ftos(f3)) \ diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 973fbabfa..dee1f9d4b 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -342,7 +342,15 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) string deathlocation = NearestLocation(targ.death_origin); #ifdef NOTIFICATIONS_DEBUG - dprint(sprintf("Obituary(): Deathtype = %s (%d), Attacker = %s, Inflictor = %s, Target = %s...\n", Deathtype_Name(deathtype), deathtype, attacker.netname, inflictor.netname, targ.netname)); + dprint( + sprintf("Obituary(%s, %s, %s, %s = %d);\n", + attacker.netname, + inflictor.netname, + targ.netname, + Deathtype_Name(deathtype), + deathtype + ) + ); #endif // ======= -- 2.39.2