From 6f4ec79f419dd08ef414f01b98ab01230e1adc61 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Fri, 14 Dec 2012 20:43:20 -0500 Subject: [PATCH] Clean up/fix some things --- qcsrc/server/g_damage.qc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 23f9720c3..71d234e83 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -578,7 +578,9 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) { s1 = targ.netname; s2 = deathmessage; + f1 = targ.killcount; if(strstrofs(s2, "%", 0) < 0) { s2 = strcat("%s ", s2); } + f2 = f3 = NO_FL_ARG; break; } @@ -592,19 +594,16 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) } } - // log and score the death LogDeath("accident", deathtype, targ, targ); GiveFrags(targ, targ, -1, deathtype); - - // achieve failure + if(PlayerScore_Add(targ, SP_SCORE, 0) == -5) { AnnounceTo(targ, "botlike"); PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_BOTLIKE, 1); } - // tell everyone about it - Obituary_SpecialDeath(targ, FALSE, deathtype, s1, s2, f1, f2, NO_FL_ARG); + Obituary_SpecialDeath(targ, FALSE, deathtype, s1, s2, f1, f2, f3); } // Set final information for the death -- 2.39.2