move more of the weapon stuff to CSQC

[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..3b4a73bc9faea43518fc67196c824aaef59f0995 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -363,13 +363,6 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                        }
                        */
 
-                       //w = DEATH_WEAPONOF(deathtype);
-                       bprint("deathtype: ", ftos(deathtype), "\n");
-                       if(WEP_VALID(w))
-                       {
-                               deathtype = DEATH_WEAPON;
-                       }
-
                        // TODO: wut is this?
                        // givefrags for logging apparently?
                        if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
@@ -530,16 +523,10 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                        */
 
                                        //w = DEATH_WEAPONOF(deathtype);
-                                       bprint("deathtype: ", ftos(deathtype), "\n");
-                                       if(WEP_VALID(w))
-                                       {
-                                               deathtype = DEATH_WEAPON;
-                                       }
 
-                                       msg = a;
                                        if (deathtype == DEATH_CUSTOM)
                                                msg = strcat(deathmessage, " by ^1", msg);
-                                       Send_KillNotification(s, msg, ftos(w), deathtype, MSG_KILL);
+                                       Send_KillNotification(s, a, msg, deathtype, MSG_KILL);
                                //}
 
                                if(g_ctf && targ.flagcarried)