r4327 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-04 05:33:58 -0400 (Thu, 04 Sep 2008)
New Revision: 4327

Modified:
   trunk/data/qcsrc/server/t_teleporters.qc
Log:
fix frag counting for portal-telefragging


Modified: trunk/data/qcsrc/server/t_teleporters.qc
===================================================================
--- trunk/data/qcsrc/server/t_teleporters.qc	2008-09-04 09:15:16 UTC (rev 4326)
+++ trunk/data/qcsrc/server/t_teleporters.qc	2008-09-04 09:33:58 UTC (rev 4327)
@@ -3,7 +3,13 @@
 {
 	entity head;
 	entity oldself;
+	entity telefragger;
 
+	if(teleporter.owner)
+		telefragger = teleporter.owner;
+	else
+		telefragger = player;
+
 	sound (player, CHAN_TRIGGER, "misc/teleport.wav", VOL_BASE, ATTN_NORM);
 	pointparticles(particleeffectnum("teleport"), player.origin, '0 0 0', 1);
 
@@ -42,11 +48,11 @@
 						if(boxesoverlap(deathmin, deathmax, head.absmin, head.absmax))
 						{
 							if ((player.classname == "player") && (player.health >= 1))
-								Damage (head, teleporter, player, 10000, DEATH_TELEFRAG, head.origin, '0 0 0');
-							else if (player.health < 1) // corpses gib
-								Damage (head, teleporter, player, 10000, DEATH_TELEFRAG, head.origin, '0 0 0');
+								Damage (head, teleporter, telefragger, 10000, DEATH_TELEFRAG, head.origin, '0 0 0');
+							else if (telefragger.health < 1) // corpses gib
+								Damage (head, teleporter, telefragger, 10000, DEATH_TELEFRAG, head.origin, '0 0 0');
 							else // dead bodies and monsters gib themselves instead of telefragging
-								Damage (player, teleporter, player, 10000, DEATH_TELEFRAG, player.origin, '0 0 0');
+								Damage (telefragger, teleporter, telefragger, 10000, DEATH_TELEFRAG, telefragger.origin, '0 0 0');
 						}
 		}