r4547 - in trunk/data/qcsrc: menu/nexuiz server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-29 02:28:16 -0400 (Mon, 29 Sep 2008)
New Revision: 4547

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
   trunk/data/qcsrc/server/cl_weapons.qc
   trunk/data/qcsrc/server/cl_weaponsystem.qc
   trunk/data/qcsrc/server/constants.qh
   trunk/data/qcsrc/server/g_hook.qc
   trunk/data/qcsrc/server/w_rocketlauncher.qc
Log:
add a SND_WEAPON2 channel for anything except actual weapon fire. Limits cutting off of weapon sounds a bit.


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c	2008-09-29 06:13:44 UTC (rev 4546)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c	2008-09-29 06:28:16 UTC (rev 4547)
@@ -92,6 +92,7 @@
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_playerchannel1volume");
+		makeMulti(s, "snd_playerchannel5volume");
 		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Weapons:"));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");

Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc	2008-09-29 06:13:44 UTC (rev 4546)
+++ trunk/data/qcsrc/server/cl_weapons.qc	2008-09-29 06:28:16 UTC (rev 4547)
@@ -278,7 +278,8 @@
 			if(ATTACK_FINISHED(self) <= time + frametime * 0.5)
 			{
 #endif
-			sound (self, CHAN_WEAPON, "weapons/weapon_switch.wav", VOL_BASE, ATTN_NORM);
+			// UGLY WORKAROUND: play this on CHAN_WEAPON2 so it can't cut off fire sounds
+			sound (self, CHAN_WEAPON2, "weapons/weapon_switch.wav", VOL_BASE, ATTN_NORM);
 			self.weaponentity.state = WS_DROP;
 			// set up weapon switch think in the future, and start drop anim
 			weapon_thinkf(WFRAME_IDLE, cvar("g_balance_weaponswitchdelay"), w_clear);

Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc	2008-09-29 06:13:44 UTC (rev 4546)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc	2008-09-29 06:28:16 UTC (rev 4547)
@@ -125,7 +125,9 @@
 		self.punchangle_x = recoil * -1;
 
 	if (snd != "")
+	{
 		sound (self, CHAN_WEAPON, snd, VOL_BASE, ATTN_NORM);
+	}
 
 	if (self.items & IT_STRENGTH)
 	if (!g_minstagib)

Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2008-09-29 06:13:44 UTC (rev 4546)
+++ trunk/data/qcsrc/server/constants.qh	2008-09-29 06:28:16 UTC (rev 4547)
@@ -111,6 +111,7 @@
 float	CHAN_VOICE				= 2; // Voice/Radio
 float	CHAN_TRIGGER			= 3; // Triggers/Items
 float	CHAN_PROJECTILE			= 4; // Projectiles
+float	CHAN_WEAPON2			= 5; // Nex fire (separated as it is a very long sound)
 float	CHAN_PAIN				= 6; // Pain
 float	CHAN_PLAYER				= 7; // Player body
 

Modified: trunk/data/qcsrc/server/g_hook.qc
===================================================================
--- trunk/data/qcsrc/server/g_hook.qc	2008-09-29 06:13:44 UTC (rev 4546)
+++ trunk/data/qcsrc/server/g_hook.qc	2008-09-29 06:28:16 UTC (rev 4547)
@@ -309,7 +309,8 @@
 
 	makevectors(self.v_angle);
 
-	sound (self, CHAN_WEAPON, "weapons/hook_fire.wav", VOL_BASE, ATTN_NORM);
+	// UGLY WORKAROUND: play this on CHAN_WEAPON2 so it can't cut off fire sounds
+	sound (self, CHAN_WEAPON2, "weapons/hook_fire.wav", VOL_BASE, ATTN_NORM);
 	org = self.origin + self.view_ofs + v_forward * 8 - v_right * 8 + '0 0 -12';
 	pointparticles(particleeffectnum("grapple_muzzleflash"), org, '0 0 0', 1);
 

Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc	2008-09-29 06:13:44 UTC (rev 4546)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc	2008-09-29 06:28:16 UTC (rev 4547)
@@ -394,7 +394,8 @@
 		if(time > self.rl_sound)
 		{
 			self.rl_sound = time + 1;
-			sound (self, CHAN_WEAPON, "weapons/rocket_det.wav", 0.5 * VOL_BASE, ATTN_NORM);
+			// UGLY WORKAROUND: play this on CHAN_WEAPON2 so it can't cut off fire sounds
+			sound (self, CHAN_WEAPON2, "weapons/rocket_det.wav", 0.5 * VOL_BASE, ATTN_NORM);
 		}
 		if (self.BUTTON_ATCK2)
 		if(g_laserguided_missile)
@@ -402,7 +403,8 @@
 		{
 			self.exteriorweaponentity.attack_finished_single = time + 0.4;
 			self.laser_on = !self.laser_on;
-			sound (self, CHAN_WEAPON, "weapons/tink1.wav", VOL_BASE, ATTN_NORM);
+			// UGLY WORKAROUND: play this on CHAN_WEAPON2 so it can't cut off fire sounds
+			sound (self, CHAN_WEAPON2, "weapons/tink1.wav", VOL_BASE, ATTN_NORM);
 		}
 	}
 	else if (req == WR_PRECACHE)