[nexuiz-commits] r6586 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-24 14:08:18 -0400 (Fri, 24 Apr 2009)
New Revision: 6586

Modified:
   trunk/data/qcsrc/server/g_triggers.qc
Log:
more "other" fixes


Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2009-04-24 17:42:13 UTC (rev 6585)
+++ trunk/data/qcsrc/server/g_triggers.qc	2009-04-24 18:08:18 UTC (rev 6586)
@@ -157,7 +157,7 @@
 	self.takedamage = DAMAGE_NO;
 
 	activator = self.enemy;
-
+	other = self.goalentity;
 	SUB_UseTargets();
 
 	if (self.wait > 0)
@@ -174,6 +174,7 @@
 
 void multi_use()
 {
+	self.goalentity = other;
 	self.enemy = activator;
 	multi_trigger();
 };
@@ -201,10 +202,11 @@
 	EXACTTRIGGER_TOUCH;
 
 	self.enemy = other;
+	self.goalentity = other;
 	multi_trigger ();
 };
 
-void multi_eventdamage (vector hitloc, float damage, entity inflictor, entity attacker, float deathtype)
+void multi_eventdamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
 	if (!self.takedamage)
 		return;
@@ -212,6 +214,7 @@
 	if (self.health <= 0)
 	{
 		self.enemy = attacker;
+		self.goalentity = inflictor;
 		multi_trigger();
 	}
 }