X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=3b4a73bc9faea43518fc67196c824aaef59f0995;hp=1946319403a4cc4038d0a0781620f60b580474f0;hb=93a5b591cd2cb527abab50a73fe279fe02efab7e;hpb=d5c1c9a5471120be6848999f7888ffcc5136ae38

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 1946319403..3b4a73bc9f 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -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)