Other updates

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 5ed7fd426fcb0dbcd9cbbcafcb3ac74a4c3145de..6b0c5f40cdda66502a3ec6818507c7af7e04d6fc 100644 (file)
--- 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 973fbabfae7f93a91b174db0d589f997cafa6c63..dee1f9d4b51aadade23aa37f08695197fa6d65ec 100644 (file)
--- 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
        
        // =======