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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-14 08:28:57 -0400 (Mon, 14 Sep 2009)
New Revision: 7783

Modified:
   trunk/data/qcsrc/server/ctf.qc
   trunk/data/qcsrc/server/keyhunt.qc
   trunk/data/qcsrc/server/portals.qc
   trunk/data/qcsrc/server/w_electro.qc
   trunk/data/qcsrc/server/w_fireball.qc
   trunk/data/qcsrc/server/w_grenadelauncher.qc
   trunk/data/qcsrc/server/w_rocketlauncher.qc
Log:
whereever event_damage is set (or damageforcescale), also set takedamage


Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc	2009-09-14 12:03:53 UTC (rev 7782)
+++ trunk/data/qcsrc/server/ctf.qc	2009-09-14 12:28:57 UTC (rev 7783)
@@ -209,6 +209,7 @@
 
 	setattachment(e, world, "");
 	e.damageforcescale = 0;
+	e.takedamage = DAMAGE_NO;
 	e.movetype = MOVETYPE_NONE;
 	if(!e.noalign)
 		e.movetype = MOVETYPE_TOSS;
@@ -296,6 +297,7 @@
 
 	setattachment(e, world, "");
 	e.damageforcescale = cvar("g_balance_ctf_damageforcescale");
+	e.takedamage = DAMAGE_YES;
 
 	if (p.flagcarried == e)
 		p.flagcarried = world;
@@ -618,6 +620,7 @@
 			setorigin(self, FLAG_CARRY_POS);
 			setattachment(self, other, "");
 			self.damageforcescale = 0;
+			e.takedamage = DAMAGE_NO;
 			WaypointSprite_AttachCarrier("flagcarrier", other);
 			WaypointSprite_UpdateTeamRadar(other.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, '1 1 0');
 		}

Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc	2009-09-14 12:03:53 UTC (rev 7782)
+++ trunk/data/qcsrc/server/keyhunt.qc	2009-09-14 12:28:57 UTC (rev 7783)
@@ -186,6 +186,7 @@
 	key.team = key.owner.team;
 	key.nextthink = time;
 	key.damageforcescale = 0;
+	key.takedamage = DAMAGE_NO;
 	key.modelindex = kh_key_carried;
 }
 
@@ -240,6 +241,7 @@
 	key.movetype = MOVETYPE_TOSS;
 	key.pain_finished = time + cvar("g_balance_keyhunt_delay_return");
 	key.damageforcescale = cvar("g_balance_keyhunt_damageforcescale");
+	key.takedamage = DAMAGE_YES;
 	// let key.team stay
 	key.modelindex = kh_key_dropped;
 	key.kh_previous_owner = key.owner;

Modified: trunk/data/qcsrc/server/portals.qc
===================================================================
--- trunk/data/qcsrc/server/portals.qc	2009-09-14 12:03:53 UTC (rev 7782)
+++ trunk/data/qcsrc/server/portals.qc	2009-09-14 12:28:57 UTC (rev 7783)
@@ -603,6 +603,7 @@
 	portal.think = Portal_Think;
 	portal.nextthink = 0;
 	portal.portal_activatetime = time + 0.1;
+	portal.takedamage = DAMAGE_AIM;
 	portal.event_damage = Portal_Damage;
 	portal.fade_time = time + cvar("g_balance_portal_lifetime");
 	portal.health = cvar("g_balance_portal_health");

Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc	2009-09-14 12:03:53 UTC (rev 7782)
+++ trunk/data/qcsrc/server/w_electro.qc	2009-09-14 12:28:57 UTC (rev 7783)
@@ -9,6 +9,7 @@
 						announce(self.owner, "announcer/male/electrobitch.wav");
 
 	self.event_damage = SUB_Null;
+	self.takedamage = DAMAGE_NO;
 	if (self.movetype == MOVETYPE_BOUNCE)
 	{
 		RadiusDamage (self, self.owner, cvar("g_balance_electro_secondary_damage"), cvar("g_balance_electro_secondary_edgedamage"), cvar("g_balance_electro_secondary_radius"), world, cvar("g_balance_electro_secondary_force"), self.projectiledeathtype, other);

Modified: trunk/data/qcsrc/server/w_fireball.qc
===================================================================
--- trunk/data/qcsrc/server/w_fireball.qc	2009-09-14 12:03:53 UTC (rev 7782)
+++ trunk/data/qcsrc/server/w_fireball.qc	2009-09-14 12:28:57 UTC (rev 7783)
@@ -10,6 +10,7 @@
 	float d;
 
 	self.event_damage = SUB_Null;
+	self.takedamage = DAMAGE_NO;
 
 	// 1. dist damage
 	d = (self.owner.health + self.owner.armorvalue);

Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc	2009-09-14 12:03:53 UTC (rev 7782)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc	2009-09-14 12:28:57 UTC (rev 7783)
@@ -8,6 +8,7 @@
 						announce(self.owner, "announcer/male/airshot.wav");
 
 	self.event_damage = SUB_Null;
+	self.takedamage = DAMAGE_NO;
 	RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_primary_damage"), cvar("g_balance_grenadelauncher_primary_edgedamage"), cvar("g_balance_grenadelauncher_primary_radius"), world, cvar("g_balance_grenadelauncher_primary_force"), self.projectiledeathtype, other);
 
 	remove (self);
@@ -22,6 +23,7 @@
 					announce(self.owner, "announcer/male/airshot.wav");
 
 	self.event_damage = SUB_Null;
+	self.takedamage = DAMAGE_NO;
 	RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_secondary_damage"), cvar("g_balance_grenadelauncher_secondary_edgedamage"), cvar("g_balance_grenadelauncher_secondary_radius"), world, cvar("g_balance_grenadelauncher_secondary_force"), self.projectiledeathtype, other);
 
 	remove (self);

Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc	2009-09-14 12:03:53 UTC (rev 7782)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc	2009-09-14 12:28:57 UTC (rev 7783)
@@ -15,6 +15,7 @@
 	W_Rocket_Unregister();
 
 	self.event_damage = SUB_Null;
+	self.takedamage = DAMAGE_NO;
 	RadiusDamage (self, self.owner, cvar("g_balance_rocketlauncher_damage"), cvar("g_balance_rocketlauncher_edgedamage"), cvar("g_balance_rocketlauncher_radius"), world, cvar("g_balance_rocketlauncher_force"), self.projectiledeathtype, other);
 
 	if (self.owner.weapon == WEP_ROCKET_LAUNCHER)