Allow forcing the player to a given team in campaign mode. Useful for story based...

[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 5ed980b2306b968d0a17f5226cc80186f1a7474c..45962bee7b3e69cb94513c8b57eccb36ba225446 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -370,20 +370,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                        msg = ftos(strstrofs(inflictor.message2, "#", 0));
                                }
 
-                               float msgtype;
-                               w = DEATH_WEAPONOF(deathtype);
-                               if(w == WEP_LASER && ((cvar("g_balance_laser_secondary_gauntlet") && w & HITTYPE_SECONDARY) || (cvar("g_balance_laser_primary_gauntlet") && !(w & HITTYPE_SECONDARY))))
-                               {
-                                       msgtype = MSG_KILL_MELEE;
-                                       deathtype = KILL_FRAG_GAUNTLET;
-                               }
-                               else if(w == WEP_SHOTGUN && (cvar("g_balance_shotgun_secondary_melee") && w & HITTYPE_SECONDARY))
-                               {
-                                       msgtype = MSG_KILL_MELEE;
-                                       deathtype = KILL_FRAG_SHOTGUN_MELEE;
-                               }
-
-                               Send_KillNotification(s, a, msg, deathtype, MSG_KILL);
+                               Send_KillNotification(a, s, msg, deathtype, MSG_KILL);
 
                                if(g_ctf && targ.flagcarried)
                                {