move more of the weapon stuff to CSQC
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_damage.qc
index 1946319..3b4a73b 100644 (file)
@@ -363,12 +363,6 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                        }
                        */
 
-                       w = DEATH_WEAPONOF(deathtype);
-                       if(!(WEP_VALID(w)))
-                       {
-                               w = -1;
-                       }
-
                        // TODO: wut is this?
                        // givefrags for logging apparently?
                        if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
@@ -504,6 +498,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                        else if(deathtype == DEATH_SBROCKET)
                         bprint ("^1",s, "^1 was blased to bits by ^1", a, "\n");
                                        else if(deathtype == DEATH_SBBLOWUP)
+                                       [
                         bprint ("^1",s, "^1 got cought in the destruction of ^1", a, "'s vehicle\n");
 
                                        else if(deathtype == DEATH_WAKIGUN)
@@ -527,16 +522,11 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                                bprint ("^1",s, "^1 was fragged by ", a, "\n");
                                        */
 
-                                       w = DEATH_WEAPONOF(deathtype);
-                                       if(!(WEP_VALID(w)))
-                                       {
-                                               w = -1;
-                                       }
+                                       //w = DEATH_WEAPONOF(deathtype);
 
-                                       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)