From: divverent Date: Mon, 31 Jan 2011 06:05:54 +0000 (+0000) Subject: also apply volume.value to ambient sounds (is this really right?) X-Git-Tag: xonotic-v0.5.0~438^2~52 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f0faa64288f36d667f40eecfb3c1a321e0a3bf8a;p=xonotic%2Fdarkplaces.git also apply volume.value to ambient sounds (is this really right?) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10789 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/snd_main.c b/snd_main.c index 391a9f9a..fac45a4f 100644 --- a/snd_main.c +++ b/snd_main.c @@ -1889,15 +1889,15 @@ void S_UpdateAmbientSounds (void) if (snd_spatialization_prologic.integer != 0) { - chan->listener_volume[0] = (int)bound(0, chan->master_vol * ambient_level.value * mastervolume.value * snd_speakerlayout.listeners[0].ambientvolume * sqrt(0.5), 65536); - chan->listener_volume[1] = (int)bound(0, chan->master_vol * ambient_level.value * mastervolume.value * snd_speakerlayout.listeners[1].ambientvolume * sqrt(0.5), 65536); + chan->listener_volume[0] = (int)bound(0, chan->master_vol * ambient_level.value * volume.value * mastervolume.value * snd_speakerlayout.listeners[0].ambientvolume * sqrt(0.5), 65536); + chan->listener_volume[1] = (int)bound(0, chan->master_vol * ambient_level.value * volume.value * mastervolume.value * snd_speakerlayout.listeners[1].ambientvolume * sqrt(0.5), 65536); for (i = 2;i < SND_LISTENERS;i++) chan->listener_volume[i] = 0; } else { for (i = 0;i < SND_LISTENERS;i++) - chan->listener_volume[i] = (int)bound(0, chan->master_vol * ambient_level.value * mastervolume.value * snd_speakerlayout.listeners[i].ambientvolume, 65536); + chan->listener_volume[i] = (int)bound(0, chan->master_vol * ambient_level.value * volume.value * mastervolume.value * snd_speakerlayout.listeners[i].ambientvolume, 65536); } } }