From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 25 Nov 2010 13:22:00 +0000 (+0100)
Subject: move electro secondary to CHAN_WEAPON2 so it doesn't interrupt the primary's lightnin... 
X-Git-Tag: xonotic-v0.1.0preview~84^2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fd5886b4935bc9bcec2c48615209621d3b2fc8dc;p=xonotic%2Fxonotic-data.pk3dir.git

move electro secondary to CHAN_WEAPON2 so it doesn't interrupt the primary's lightning sound
---

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 2770d4314..271dff629 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -237,9 +237,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m
 		ent.punchangle_x = recoil * -1;
 
 	if (snd != "")
-	{
 		sound (ent, CHAN_WEAPON, snd, VOL_BASE, ATTN_NORM);
-	}
 
 	if(ent.items & IT_STRENGTH)
 	if(!g_minstagib)
diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index f64e4ca8d..225fc6913 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -147,7 +147,8 @@ void W_Electro_Attack2()
 {
 	local entity proj;
 
-	W_SetupShot_ProjectileSize (self, '0 0 -4', '0 0 -4', FALSE, 2, "weapons/electro_fire2.wav", cvar("g_balance_electro_secondary_damage"));
+	W_SetupShot_ProjectileSize (self, '0 0 -4', '0 0 -4', FALSE, 2, "", cvar("g_balance_electro_secondary_damage"));
+	sound(self, CHAN_WEAPON2, "weapons/electro_fire2.wav", VOL_BASE, ATTN_NORM);
 	w_shotdir = v_forward; // no TrueAim for grenades please
 
 	pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
@@ -289,9 +290,7 @@ void W_Electro_Attack3 (void)
 {
 	// only play fire sound if 0.5 sec has passed since player let go the fire button
 	if(time - self.prevlgfire > 0.5)
-	{
 		sound (self, CHAN_WEAPON, "weapons/lgbeam_fire.wav", VOL_BASE, ATTN_NORM);
-	}
 
 	entity beam, oldself;