r4840 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-23 09:01:13 -0400 (Thu, 23 Oct 2008)
New Revision: 4840

Modified:
   trunk/data/qcsrc/server/w_hlac.qc
Log:
HLAC: use projectiledeathtype properly


Modified: trunk/data/qcsrc/server/w_hlac.qc
===================================================================
--- trunk/data/qcsrc/server/w_hlac.qc	2008-10-23 12:58:59 UTC (rev 4839)
+++ trunk/data/qcsrc/server/w_hlac.qc	2008-10-23 13:01:13 UTC (rev 4840)
@@ -22,7 +22,7 @@
 
 	self.event_damage = SUB_Null;
 
-    RadiusDamage (self, self.owner, cvar("g_balance_hlac_primary_damage"), cvar("g_balance_hlac_primary_edgedamage"), cvar("g_balance_hlac_primary_radius"), world, cvar("g_balance_hlac_primary_force"), WEP_HLAC, other);
+    RadiusDamage (self, self.owner, cvar("g_balance_hlac_primary_damage"), cvar("g_balance_hlac_primary_edgedamage"), cvar("g_balance_hlac_primary_radius"), world, cvar("g_balance_hlac_primary_force"), self.projectiledeathtype, other);
 	sound (self, CHAN_PROJECTILE, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM);
 
 	remove (self);
@@ -51,7 +51,7 @@
 
 	//self.event_damage = SUB_Null;
 
-    RadiusDamage (self, self.owner, cvar("g_balance_hlac_secondary_damage"), cvar("g_balance_hlac_secondary_edgedamage"), cvar("g_balance_hlac_secondary_radius"), world, cvar("g_balance_hlac_secondary_force"), WEP_HLAC, other);
+    RadiusDamage (self, self.owner, cvar("g_balance_hlac_secondary_damage"), cvar("g_balance_hlac_secondary_edgedamage"), cvar("g_balance_hlac_secondary_radius"), world, cvar("g_balance_hlac_secondary_force"), self.projectiledeathtype, other);
 	sound (self, CHAN_PROJECTILE, "weapons/laserimpact.wav", VOL_BASE, ATTN_NORM);
 
 	remove (self);
@@ -107,6 +107,7 @@
 
 	missile.effects = EF_LOWPRECISION;
 	missile.flags = FL_PROJECTILE;
+	missile.projectiledeathtype = WEP_HLAC;
 }
 
 void W_HLAC_Attack2f (void)
@@ -150,6 +151,7 @@
 
 	missile.effects = EF_LOWPRECISION;
 	missile.flags = FL_PROJECTILE;
+	missile.projectiledeathtype = WEP_HLAC | HITTYPE_SECONDARY;
 }
 
 void W_HLAC_Attack2 (void)