From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 1 Dec 2010 08:12:17 +0000 (+0000)
Subject: 100% untested: additionally apply mastervolume to ambient sound channels
X-Git-Tag: xonotic-v0.5.0~438^2~196
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=750d19efdc7013c4380d3a5823389e2617af41a1;p=xonotic%2Fdarkplaces.git

100% untested: additionally apply mastervolume to ambient sound channels

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10645 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/snd_main.c b/snd_main.c
index 1a59c3b7..e328b939 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 * snd_speakerlayout.listeners[0].ambientvolume * sqrt(0.5), 65536);
-			chan->listener_volume[1] = (int)bound(0, chan->master_vol * ambient_level.value * snd_speakerlayout.listeners[1].ambientvolume * sqrt(0.5), 65536);
+			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);
 			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 * snd_speakerlayout.listeners[i].ambientvolume, 65536);
+				chan->listener_volume[i] = (int)bound(0, chan->master_vol * ambient_level.value * mastervolume.value * snd_speakerlayout.listeners[i].ambientvolume, 65536);
 		}
 	}
 }