From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 4 Aug 2010 12:03:16 +0000 (+0300)
Subject: telefrag notify code + placeholder telefrag icon
X-Git-Tag: xonotic-v0.1.0preview~372
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=71b8091b1a688b68dfa80c2ce278fcb7c1f45df9;p=xonotic%2Fxonotic-data.pk3dir.git

telefrag notify code + placeholder telefrag icon
---

diff --git a/gfx/hud/default/notify_telefrag.tga b/gfx/hud/default/notify_telefrag.tga
new file mode 100644
index 000000000..279910f2b
Binary files /dev/null and b/gfx/hud/default/notify_telefrag.tga differ
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index f2b900fa9..bb46900b6 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -2473,8 +2473,13 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
 		else if(type == KILL_FIRST_BLOOD)
 			print("^1",s1, "^1 drew first blood", "\n");
 		// TODO: icon!
-		else if (type == DEATH_TELEFRAG)
-			print ("^1",s1, "^1 was telefragged by ", s2, "\n");
+		else if (type == DEATH_TELEFRAG) {
+			HUD_KillNotify_Push(s2, s1, 1, DEATH_TELEFRAG);
+			if(gentle)
+				print ("^1",s1, "^1 tried to occupy ", s2, "^1's teleport destination space\n");
+			else
+				print ("^1",s1, "^1 was telefragged by ", s2, "\n");
+		}
 		else if (type == DEATH_DROWN) {
 			HUD_KillNotify_Push(s2, s1, 1, DEATH_DROWN);
 			if(alsoprint)
@@ -3024,6 +3029,10 @@ void HUD_Notify (void)
 			{
 				s = "notify_teamkill_red";
 			}
+			else if(killnotify_deathtype[j] == DEATH_TELEFRAG)
+			{
+				s = "notify_telefrag";
+			}
 			else if(killnotify_deathtype[j] == DEATH_DROWN)
 			{
 				s = "notify_water";