From 4f73ed4b3fef34539204ed7560909fa2fea42805 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 4 Jul 2011 12:28:04 +0200 Subject: [PATCH] more channels --- defaultXonotic.cfg | 4 ++-- qcsrc/common/constants.qh | 28 ++++++++++++---------- qcsrc/menu/xonotic/dialog_settings_audio.c | 4 ++-- qcsrc/server/miscfunctions.qc | 4 +--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index c98dc2ec4..a536af133 100644 --- 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 3140e1652..86389c6b4 100644 --- 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 bee86ab0e..69d6af6b0 100644 --- 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 a13004910..b8c955387 100644 --- 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; -- 2.39.2