r5545 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-15 08:46:30 -0500 (Thu, 15 Jan 2009)
New Revision: 5545

Modified:
   trunk/data/qcsrc/server/w_electro.qc
   trunk/data/qcsrc/server/w_rocketlauncher.qc
   trunk/data/qcsrc/server/w_seeker.qc
Log:
remove some unnecessary stopsound calls


Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc	2009-01-15 13:45:24 UTC (rev 5544)
+++ trunk/data/qcsrc/server/w_electro.qc	2009-01-15 13:46:30 UTC (rev 5545)
@@ -15,13 +15,11 @@
 	{
 		pointparticles(particleeffectnum("electro_ballexplode"), org2, '0 0 0', 1);
 		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);
-		stopsound (self, CHAN_PAIN);
 	}
 	else
 	{
 		pointparticles(particleeffectnum("electro_impact"), org2, '0 0 0', 1);
 		RadiusDamage (self, self.owner, cvar("g_balance_electro_primary_damage"), cvar("g_balance_electro_primary_edgedamage"), cvar("g_balance_electro_primary_radius"), world, cvar("g_balance_electro_primary_force"), self.projectiledeathtype, other);
-		//stopsound (self, CHAN_PAIN);
 	}
 
 	sound (self, CHAN_PROJECTILE, "weapons/electro_impact.wav", VOL_BASE, ATTN_NORM);
@@ -35,7 +33,6 @@
 	org2 = findbetterlocation (self.origin, 8);
 	pointparticles(particleeffectnum("electro_combo"), org2, '0 0 0', 1);
 
-	stopsound (self, CHAN_PAIN);
 	sound (self, CHAN_PROJECTILE, "weapons/electro_impact_combo.wav", VOL_BASE, ATTN_NORM);
 
 	self.event_damage = SUB_Null;
@@ -47,7 +44,7 @@
 {
 	UpdateCSQCProjectile(self);
 
-	PROJECTILE_TOUCH_NOSOUND;
+	PROJECTILE_TOUCH;
 	if (other.takedamage == DAMAGE_AIM) {
 		W_Plasma_Explode ();
 	} else {

Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc	2009-01-15 13:45:24 UTC (rev 5544)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc	2009-01-15 13:46:30 UTC (rev 5545)
@@ -4,7 +4,6 @@
 void W_Rocket_Explode (void)
 {
 	vector	org2;
-	stopsound(self, CHAN_PAIN);
 	sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
 	org2 = findbetterlocation (self.origin, 16);
 
@@ -186,7 +185,7 @@
 {
 	if(self.owner && self.owner.lastrocket == self)
 		self.owner.lastrocket = world;
-	PROJECTILE_TOUCH_NOSOUND;
+	PROJECTILE_TOUCH;
 	W_Rocket_Explode ();
 }
 

Modified: trunk/data/qcsrc/server/w_seeker.qc
===================================================================
--- trunk/data/qcsrc/server/w_seeker.qc	2009-01-15 13:45:24 UTC (rev 5544)
+++ trunk/data/qcsrc/server/w_seeker.qc	2009-01-15 13:46:30 UTC (rev 5545)
@@ -300,15 +300,12 @@
 	vector dir;
 	vector org2;
 
-	PROJECTILE_TOUCH_NOSOUND;
-
 	dir     = normalize (self.owner.origin - self.origin);
 	org2    = findbetterlocation (self.origin, 8);
 
 	te_knightspike(org2);
 
 	self.event_damage = SUB_Null;
-	stopsound (self, CHAN_PAIN);
 	sound (self, CHAN_PROJECTILE, "weapons/tag_impact.wav", 1, ATTN_NORM);
 
 	if (other.takedamage == DAMAGE_AIM && other.deadflag == DEAD_NO)