more channels

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index c98dc2ec462d0832073c4cfb1b0d7d99d48b6ea3..a536af133f8faa85618b1401edb72f84b032208c 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -2137,8 +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_channel0extra1volume 1 "QuakeC controlled background music volume"
-seta snd_channel1extra1volume 1 "QuakeC controlled ambient sound volume"
+seta snd_channel8volume 1 "QuakeC controlled background music volume"
+seta snd_channel9volume 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 3140e16529e96a22539bb45258ccdb0e360dace1..86389c6b4ae1e674f619bfc1d9202439803d6361 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -444,19 +444,21 @@ 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
-#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)
+// FIXME convert back to float .... =
+float CH_INFO = 0;
+float CH_TRIGGER = -3;
+float CH_WEAPON_A = -1;
+float CH_WEAPON_SINGLE = 1;
+float CH_VOICE = -2;
+float CH_BGM_SINGLE = 8;
+float CH_AMBIENT = -9;
+float CH_TRIGGER_SINGLE = 3;
+float CH_SHOTS_SINGLE = 4;
+float CH_WEAPON_B = -1;
+float CH_PAIN = -6;
+float CH_PAIN_SINGLE = 6;
+float CH_PLAYER = -7;
+#define sound(e,c,s,v,a) sound7(e,c,s,v,a,0,0)
 #endif
 
 float  ATTN_NONE                               = 0;

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c
index bee86ab0e91935b4b5537605bb141c66a2f50ca6..69d6af6b01898b0d3370f9217d52a3824ede7ce1 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_channel0extra1volume");
+               makeMulti(s, "snd_channel8volume");
                me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Music:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");
@@ -37,7 +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");
+               makeMulti(s, "snd_channel9volume");
                me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, ZCTX(_("VOL^Ambient:"))));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index a130049102c0c3be423d73063b2add6bdb30d9b5..b8c9553873de97f826ade8b67eb0051f7f826492 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1361,8 +1361,6 @@ void soundtoat(float dest, entity e, vector o, float chan, string samp, float vo
     entno = num_for_edict(e);
     idx = precache_sound_index(samp);
 
-    chan = ((chan & 0x07) | ((chan & 0x1F0) / 2));
-
     float sflags;
     sflags = 0;
 
@@ -1373,7 +1371,7 @@ void soundtoat(float dest, entity e, vector o, float chan, string samp, float vo
         sflags |= SND_VOLUME;
     if (atten != 64)
         sflags |= SND_ATTENUATION;
-    if (entno >= 8192 || chan > 7)
+    if (entno >= 8192 || chan < 0 || chan > 7)
         sflags |= SND_LARGEENTITY;
     if (idx >= 256)
         sflags |= SND_LARGESOUND;