X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_mix.c;h=6bba3c1ad8870912efc8788ce3aa45c693a13939;hp=79e6e0738803091e83f3ad084e286bc46c5fcb6f;hb=32510c922fbcaad22056befd2018ea9066c1f138;hpb=80234e3d370436fe1a9a06ac93404362349f72c8

diff --git a/snd_mix.c b/snd_mix.c
index 79e6e073..6bba3c1a 100644
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -189,9 +189,9 @@ static qboolean SND_PaintChannel (channel_t *ch, portable_sampleframe_t *paint,
 
 	// If this channel manages its own volume
 	if (ch->flags & CHANNELFLAG_FULLVOLUME)
-		snd_vol = 256;
+		snd_vol = (int)(mastervolume.value * 256);
 	else
-		snd_vol = (int)(volume.value * 256);
+		snd_vol = (int)(mastervolume.value * volume.value * 256);
 
 	// calculate mixing volumes based on channel volumes and volume cvar
 	// also limit the volumes to values that won't clip