Clean up/fix some things

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 23f9720c3e500372a364fbde188811b8616e113d..71d234e83042e63204132a660e1b265f704dd79b 100644 (file)
--- 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