Merge branch 'master' into fruitiex/newpanelhud

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_damage.qc

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 7f7f8f1c54f5aca54169786147aa8dfe71abdad1..14ef6ef2614a1ea77f806b77e9fa9ae3b39194a1 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -363,10 +363,11 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                        }
                        */
 
-                       //w = DEATH_WEAPONOF(deathtype);
+                       w = DEATH_WEAPONOF(deathtype);
                        bprint("deathtype: ", ftos(deathtype), "\n");
                        if(WEP_VALID(w))
                        {
+                               msg = ftos(deathtype);
                                deathtype = DEATH_WEAPON;
                        }