change the constants for DP_SND_EXTRACHANNELS

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 1d932f6e61156b730a1178b9671210ae44337865..c98dc2ec462d0832073c4cfb1b0d7d99d48b6ea3 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -2137,11 +2137,8 @@ set g_playerstats_debug 0 "when 1, player stats are dumped to the console too"
 set snd_soundradius 1200
 
 // declare the channels we use
-seta snd_channel256volume 1
-seta snd_channel257volume 1
-seta snd_channel258volume 1
-seta snd_channel259volume 1
-seta snd_channel260volume 1
+seta snd_channel0extra1volume 1 "QuakeC controlled background music volume"
+seta snd_channel1extra1volume 1 "QuakeC controlled ambient sound volume"
 
 // loading screen
 scr_loadingscreen_background 0

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index f79c71bda6882aa255ba9472cc16f011ae26d6da..3140e16529e96a22539bb45258ccdb0e360dace1 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -434,9 +434,9 @@ 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_VOICE = 2; // only on players
+float CH_BGM_SINGLE = 2; // only on csqc; compat: FALSELY CONTROLLED BY "Voice"
+float CH_AMBIENT = 2; // only on csqc; compat: FALSELY CONTROLLED BY "Voice"
 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
@@ -444,19 +444,19 @@ float CH_PAIN = 6; // only on players and csqc
 float CH_PAIN_SINGLE = 6; // only on players and csqc
 float CH_PLAYER = 7; // only on players and entities
 #else
-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;
-float CH_PAIN = 259;
-float CH_PAIN_SINGLE = 6;
-float CH_PLAYER = 260;
+#define CH_INFO                  (0)
+#define CH_TRIGGER               (3 | CHANFLAG_FORCEAUTO)
+#define CH_WEAPON_A              (1 | CHANFLAG_FORCEAUTO)
+#define CH_WEAPON_SINGLE         (1)
+#define CH_VOICE                 (2 | CHANFLAG_FORCEAUTO)
+#define CH_BGM_SINGLE            (0 | CHAN_EXTRA1)
+#define CH_AMBIENT               (1 | CHAN_EXTRA1 | CHANFLAG_FORCEAUTO)
+#define CH_TRIGGER_SINGLE        (3)
+#define CH_SHOTS_SINGLE          (4)
+#define CH_WEAPON_B              (1 | CHANFLAG_FORCEAUTO)
+#define CH_PAIN                  (6 | CHANFLAG_FORCEAUTO)
+#define CH_PAIN_SINGLE           (6)
+#define CH_PLAYER                (7 | CHANFLAG_FORCEAUTO)
 #endif
 
 float  ATTN_NONE                               = 0;

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c
index cb69394b5fb97690025e0ded5d432c81b0ec6f55..bee86ab0e91935b4b5537605bb141c66a2f50ca6 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_audio.c
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.c
@@ -29,7 +29,7 @@ void XonoticAudioSettingsTab_fill(entity me)
        me.TR(me);
                me.TDempty(me, 0.2);
                s = makeXonoticDecibelsSlider(-20, 0, 0.5, "bgmvolume");
-               makeMulti(s, "snd_channel2volume");
+               makeMulti(s, "snd_channel0extra1volume");
                me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Music:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
@@ -37,6 +37,7 @@ void XonoticAudioSettingsTab_fill(entity me)
        me.TR(me);
                me.TDempty(me, 0.2);
                s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_staticvolume");
+               makeMulti(s, "snd_channel1extra1volume");
                me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, ZCTX(_("VOL^Ambient:"))));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
@@ -51,7 +52,6 @@ void XonoticAudioSettingsTab_fill(entity me)
        me.TR(me);
                me.TDempty(me, 0.2);
                s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel3volume");
-               makeMulti(s, "snd_channel256volume");
                me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Items:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
@@ -59,15 +59,13 @@ void XonoticAudioSettingsTab_fill(entity me)
        me.TR(me);
                me.TDempty(me, 0.2);
                s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel6volume");
-               makeMulti(s, "snd_channel259volume");
                me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Pain:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel260volume");
-               makeMulti(s, "snd_channel7volume"); // legacy
+               s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel7volume");
                me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Player:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
@@ -81,16 +79,15 @@ void XonoticAudioSettingsTab_fill(entity me)
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel258volume");
+               s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel2volume");
                me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Voice:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
                setDependentStringNotEqual(s, "mastervolume", "0");
        me.TR(me);
                me.TDempty(me, 0.2);
-               s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel257volume");
-               //makeMulti(s, "snd_channel1volume");
-               makeMulti(s, "snd_channel1volume snd_channel5volume"); // snd_channel5volume is legacy
+               s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel1volume");
+               makeMulti(s, "snd_channel5volume"); // legacy
                me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Weapons:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");