From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 3 Jul 2011 17:51:20 +0000 (+0200)
Subject: add a CH_WEAPON_SINGLE for possible charging sounds
X-Git-Tag: xonotic-v0.5.0~151^2~2^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc8badff1b354fcbe83b8a8bb5e058896fd5864d;p=xonotic%2Fxonotic-data.pk3dir.git

add a CH_WEAPON_SINGLE for possible charging sounds
---

diff --git a/qcsrc/client/particles.qc b/qcsrc/client/particles.qc
index 0c7750af0..b7233eee1 100644
--- a/qcsrc/client/particles.qc
+++ b/qcsrc/client/particles.qc
@@ -58,7 +58,7 @@ void Draw_PointParticles()
 			if(self.noise != "")
 			{
 				self.origin = p;
-				sound(self, CH_TRIGGER_SINGLE, self.noise, VOL_BASE * self.volume, self.atten);
+				sound(self, CH_AMBIENT, self.noise, VOL_BASE * self.volume, self.atten);
 			}
 			self.just_toggled = 0;
 		}
diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 31c91b221..f79c71bda 100644
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -433,8 +433,10 @@ const float STAT_DOM_PPS_YELLOW = 104;
 float CH_INFO = 0; // only on world and csqc
 float CH_TRIGGER = 0; // only on players; compat: FALSELY CONTROLLED BY "Info"
 float CH_WEAPON_A = 1; // only on players and entities
+float CH_WEAPON_SINGLE = 1; // only on players and entities
 float CH_VOICE = 2; // only on players; compat: FALSELY CONTROLLED BY "BGM"
 float CH_BGM_SINGLE = 2; // only on csqc
+float CH_AMBIENT = 2; // only on csqc; compat: FALSELY CONTROLLED BY "BGM"
 float CH_TRIGGER_SINGLE = 3; // only on players, entities, csqc
 float CH_SHOTS_SINGLE = 4; // only on players, entities, csqc
 float CH_WEAPON_B = 5; // only on players and entities
@@ -445,8 +447,10 @@ float CH_PLAYER = 7; // only on players and entities
 float CH_INFO = 0; // only on world and csqc!
 float CH_TRIGGER = 256;
 float CH_WEAPON_A = 257;
+float CH_WEAPON_SINGLE = 1;
 float CH_VOICE = 258;
 float CH_BGM_SINGLE = 2;
+float CH_AMBIENT = 261;
 float CH_TRIGGER_SINGLE = 3;
 float CH_SHOTS_SINGLE = 4;
 float CH_WEAPON_B = 257;
@@ -455,50 +459,6 @@ float CH_PAIN_SINGLE = 6;
 float CH_PLAYER = 260;
 #endif
 
-#ifdef LEGACY_CHANS
-// this assignment must match menu/xonotic/dialog_settings_misc.c!
-float	CHAN_AUTO				= 0;
-	// on world: announcers, ...                     INFO
-	// on players: item pickup                       ITEMS
-	// on entities: UNUSED
-	// on csqc: announcers                           INFO
-float	CHAN_WEAPON				= 1; // Weapon fire
-	// on world: UNUSED
-	// on players: weapon firing                     WEAPONS
-	// on entities: turret firing                    WEAPONS
-	// on csqc: UNUSED
-float	CHAN_VOICE				= 2; // Voice/Radio
-	// on world: UNUSED
-	// on players: voice                             VOICE
-	// on entities: UNUSED
-	// on csqc: background music                     BGM
-float	CHAN_TRIGGER			= 3; // Triggers/Items
-	// on world: UNUSED
-	// on players: item pickup                       ITEMS
-	// on entities: platforms moving etc.            ITEMS
-	// on csqc: platforms moving etc.                ITEMS
-float	CHAN_PROJECTILE			= 4; // Projectiles
-	// on world: UNUSED
-	// on players: projectiles hitting player        SHOTS
-	// on entities: projectiles                      SHOTS
-	// on csqc: projectile sounds                    SHOTS
-float	CHAN_WEAPON2			= 5; // Nex fire (separated as it is a very long sound)
-	// on world: UNUSED
-	// on players: weapon firing                     WEAPONS
-	// on entities: turret firing                    WEAPONS
-	// on csqc: UNUSED
-float	CHAN_PAIN				= 6; // Pain
-	// on world: UNUSED
-	// on players: pain                              PAIN
-	// on entities: projectiles flying               SHOTS
-	// on csqc: player pain                          PAIN
-float	CHAN_PLAYER				= 7; // Player body
-	// on world: UNUSED
-	// on players: player sounds                     PLAYER
-	// on entities: player sounds                    PLAYER
-	// on csqc: UNUSED
-#endif
-
 float	ATTN_NONE				= 0;
 float	ATTN_MIN				= 0.015625;
 float	ATTN_NORM				= 0.5;
diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c
index 9d6d76506..cb69394b5 100644
--- a/qcsrc/menu/xonotic/dialog_settings_audio.c
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.c
@@ -89,7 +89,8 @@ void XonoticAudioSettingsTab_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel257volume");
-		makeMulti(s, "snd_channel1volume snd_channel5volume"); // legacy
+		//makeMulti(s, "snd_channel1volume");
+		makeMulti(s, "snd_channel1volume snd_channel5volume"); // snd_channel5volume is legacy
 		me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Weapons:")));
 		me.TD(me, 1, 2, s);
 		setDependentStringNotEqual(e, "mastervolume", "0");