]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix suicides
authorSamual Lenks <samual@xonotic.org>
Sat, 2 Mar 2013 03:21:30 +0000 (22:21 -0500)
committerSamual Lenks <samual@xonotic.org>
Sat, 2 Mar 2013 03:21:30 +0000 (22:21 -0500)
qcsrc/server/g_damage.qc

index f357f5123aae57573d33cc56d4daaaacf19d0b24..3f768ffdc62e33d26d29fff3a95042a7fcca03e2 100644 (file)
@@ -390,14 +390,15 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
                                                break;
                                        }
                                }
-                               LogDeath("suicide", deathtype, targ, targ);
-                               GiveFrags(attacker, targ, -1, deathtype);
                        }
                }
                else if not(Obituary_WeaponDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0))
                {
                        backtrace("SUICIDE: what the hell happened here?\n");
+                       return;
                }
+               LogDeath("suicide", deathtype, targ, targ);
+               GiveFrags(attacker, targ, -1, deathtype);
        }
 
        // ======