r3569 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Wed Apr 2 08:06:26 EDT 2008


Author: lordhavoc
Date: 2008-04-02 08:06:25 -0400 (Wed, 02 Apr 2008)
New Revision: 3569

Modified:
   trunk/data/qcsrc/server/w_hagar.qc
Log:
allow hitting yourself with bounced hagar projectiles


Modified: trunk/data/qcsrc/server/w_hagar.qc
===================================================================
--- trunk/data/qcsrc/server/w_hagar.qc	2008-04-02 11:16:33 UTC (rev 3568)
+++ trunk/data/qcsrc/server/w_hagar.qc	2008-04-02 12:06:25 UTC (rev 3569)
@@ -13,7 +13,7 @@
 		sound (self, CHAN_BODY, "weapons/hagexp3.wav", 1, ATTN_NORM);
 
 	self.event_damage = SUB_Null;
-	RadiusDamage (self, self.owner, cvar("g_balance_hagar_primary_damage"), cvar("g_balance_hagar_primary_edgedamage"), cvar("g_balance_hagar_primary_radius"), world, cvar("g_balance_hagar_primary_force"), IT_HAGAR);
+	RadiusDamage (self, self.realowner, cvar("g_balance_hagar_primary_damage"), cvar("g_balance_hagar_primary_edgedamage"), cvar("g_balance_hagar_primary_radius"), world, cvar("g_balance_hagar_primary_force"), IT_HAGAR);
 
 	remove (self);
 }
@@ -33,7 +33,7 @@
 		sound (self, CHAN_BODY, "weapons/hagexp3.wav", 1, ATTN_NORM);
 
 	self.event_damage = SUB_Null;
-	RadiusDamage (self, self.owner, cvar("g_balance_hagar_secondary_damage"), cvar("g_balance_hagar_secondary_edgedamage"), cvar("g_balance_hagar_secondary_radius"), world, cvar("g_balance_hagar_secondary_force"), IT_HAGAR);
+	RadiusDamage (self, self.realowner, cvar("g_balance_hagar_secondary_damage"), cvar("g_balance_hagar_secondary_edgedamage"), cvar("g_balance_hagar_secondary_radius"), world, cvar("g_balance_hagar_secondary_force"), IT_HAGAR);
 
 	remove (self);
 }
@@ -65,6 +65,7 @@
 		self.cnt++;
 		pointparticles(particleeffectnum("hagar_bounce"), self.origin, self.velocity, 1);
 		self.angles = vectoangles (self.velocity);
+		self.owner = world;
 	}
 }
 
@@ -87,7 +88,7 @@
 	pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 
 	missile = spawn ();
-	missile.owner = self;
+	missile.owner = missile.realowner = self;
 	missile.classname = "missile";
 	missile.bot_dodge = TRUE;
 	missile.bot_dodgerating = cvar("g_balance_hagar_primary_damage");
@@ -126,7 +127,7 @@
 	pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 
 	missile = spawn ();
-	missile.owner = self;
+	missile.owner = missile.realowner = self;
 	missile.classname = "missile";
 	missile.bot_dodge = TRUE;
 	missile.bot_dodgerating = cvar("g_balance_hagar_secondary_damage");




More information about the nexuiz-commits mailing list