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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-03 06:02:06 -0400 (Fri, 03 Oct 2008)
New Revision: 4595

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
   trunk/data/qcsrc/server/constants.qh
Log:
updated channel assignment to help tZork's turrets


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c	2008-10-03 09:02:49 UTC (rev 4594)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c	2008-10-03 10:02:06 UTC (rev 4595)
@@ -41,6 +41,7 @@
 		me.TDempty(me, 0.2);
 		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_staticvolume");
 		me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Ambient:"));
+		makeMulti(s, "snd_entchannel2volume");
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "volume", "0");
 		setDependentStringNotEqual(s, "volume", "0");
@@ -92,7 +93,7 @@
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_playerchannel1volume");
-		makeMulti(s, "snd_playerchannel5volume");
+		makeMulti(s, "snd_playerchannel5volume snd_entchannel1volume snd_entchannel5volume");
 		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/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2008-10-03 09:02:49 UTC (rev 4594)
+++ trunk/data/qcsrc/server/constants.qh	2008-10-03 10:02:06 UTC (rev 4595)
@@ -106,14 +106,39 @@
 float	TE_LAVASPLASH				= 10;
 float	TE_TELEPORT				= 11;
 
-float	CHAN_AUTO				= 0; // Announcer/Chat, on player: Triggers/Items
+// this assignment must match menu/nexuiz/dialog_settings_misc.c!
+float	CHAN_AUTO				= 0;
+	// on world: info (announcers, ...)
+	// on players: item pickup
+	// on entities: UNUSED
 float	CHAN_WEAPON				= 1; // Weapon fire
+	// on world: UNUSED
+	// on players: weapon firing
+	// on entities: turret firing
 float	CHAN_VOICE				= 2; // Voice/Radio
+	// on world: UNUSED
+	// on players: voice
+	// on entities: ambient
 float	CHAN_TRIGGER			= 3; // Triggers/Items
+	// on world: UNUSED
+	// on players: item pickup
+	// on entities: platforms moving etc.
 float	CHAN_PROJECTILE			= 4; // Projectiles
+	// on world: UNUSED
+	// on players: projectiles hitting player
+	// on entities: projectiles
 float	CHAN_WEAPON2			= 5; // Nex fire (separated as it is a very long sound)
+	// on world: UNUSED
+	// on players: weapon firing
+	// on entities: turret firing
 float	CHAN_PAIN				= 6; // Pain
+	// on world: UNUSED
+	// on players: pain
+	// on entities: UNUSED
 float	CHAN_PLAYER				= 7; // Player body
+	// on world: UNUSED
+	// on players: player sounds
+	// on entities: player sounds
 
 float	ATTN_NONE				= 0;
 float	ATTN_NORM				= 0.5;