X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=snd_main.c;h=62807eb0983a79cb7529913aea7aaf29b46b5599;hb=349cb25ab576480b733e8f575e529181f4bceae4;hp=d54267bdb6d44b7a57b346ea8ed45cba1c2dbd2a;hpb=761fffe0368fc91c54499c416d10fa98d888e5bd;p=xonotic%2Fdarkplaces.git

diff --git a/snd_main.c b/snd_main.c
index d54267bd..62807eb0 100644
--- a/snd_main.c
+++ b/snd_main.c
@@ -51,24 +51,24 @@ static const speakerlayout_t snd_speakerlayouts[] =
 	{
 		"surround71", 8,
 		{
-			{0, 45, 0.2, 0.2, 0.5}, // front left
-			{1, 315, 0.2, 0.2, 0.5}, // front right
-			{2, 135, 0.2, 0.2, 0.5}, // rear left
-			{3, 225, 0.2, 0.2, 0.5}, // rear right
-			{4, 0, 0.2, 0.2, 0.5}, // front center
+			{0, 45, 0.2f, 0.2f, 0.5f}, // front left
+			{1, 315, 0.2f, 0.2f, 0.5f}, // front right
+			{2, 135, 0.2f, 0.2f, 0.5f}, // rear left
+			{3, 225, 0.2f, 0.2f, 0.5f}, // rear right
+			{4, 0, 0.2f, 0.2f, 0.5f}, // front center
 			{5, 0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so...  no lfe)
-			{6, 90, 0.2, 0.2, 0.5}, // side left
-			{7, 180, 0.2, 0.2, 0.5}, // side right
+			{6, 90, 0.2f, 0.2f, 0.5f}, // side left
+			{7, 180, 0.2f, 0.2f, 0.5f}, // side right
 		}
 	},
 	{
 		"surround51", 6,
 		{
-			{0, 45, 0.2, 0.2, 0.5}, // front left
-			{1, 315, 0.2, 0.2, 0.5}, // front right
-			{2, 135, 0.2, 0.2, 0.5}, // rear left
-			{3, 225, 0.2, 0.2, 0.5}, // rear right
-			{4, 0, 0.2, 0.2, 0.5}, // front center
+			{0, 45, 0.2f, 0.2f, 0.5f}, // front left
+			{1, 315, 0.2f, 0.2f, 0.5f}, // front right
+			{2, 135, 0.2f, 0.2f, 0.5f}, // rear left
+			{3, 225, 0.2f, 0.2f, 0.5f}, // rear right
+			{4, 0, 0.2f, 0.2f, 0.5f}, // front center
 			{5, 0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so...  no lfe)
 			{0, 0, 0, 0, 0},
 			{0, 0, 0, 0, 0},
@@ -79,10 +79,10 @@ static const speakerlayout_t snd_speakerlayouts[] =
 		// channel of its own
 		"surround40", 4,
 		{
-			{0, 45, 0.3, 0.3, 0.8}, // front left
-			{1, 315, 0.3, 0.3, 0.8}, // front right
-			{2, 135, 0.3, 0.3, 0.8}, // rear left
-			{3, 225, 0.3, 0.3, 0.8}, // rear right
+			{0, 45, 0.3f, 0.3f, 0.8f}, // front left
+			{1, 315, 0.3f, 0.3f, 0.8f}, // front right
+			{2, 135, 0.3f, 0.3f, 0.8f}, // rear left
+			{3, 225, 0.3f, 0.3f, 0.8f}, // rear right
 			{0, 0, 0, 0, 0},
 			{0, 0, 0, 0, 0},
 			{0, 0, 0, 0, 0},
@@ -94,8 +94,8 @@ static const speakerlayout_t snd_speakerlayouts[] =
 		// channel of its own
 		"stereo", 2,
 		{
-			{0, 90, 0.5, 0.5, 1}, // side left
-			{1, 270, 0.5, 0.5, 1}, // side right
+			{0, 90, 0.5f, 0.5f, 1}, // side left
+			{1, 270, 0.5f, 0.5f, 1}, // side right
 			{0, 0, 0, 0, 0},
 			{0, 0, 0, 0, 0},
 			{0, 0, 0, 0, 0},
@@ -1502,7 +1502,7 @@ static void SND_Spatialize_WithSfx(channel_t *ch, qboolean isstatic, sfx_t *sfx)
 
 				if(snd_spatialization_occlusion.integer & 2)
 					if(!occluded)
-						if(cl.worldmodel && cl.worldmodel->brush.TraceLineOfSight && !cl.worldmodel->brush.TraceLineOfSight(cl.worldmodel, listener_origin, ch->origin))
+						if(cl.worldmodel && cl.worldmodel->brush.TraceLineOfSight && !cl.worldmodel->brush.TraceLineOfSight(cl.worldmodel, listener_origin, ch->origin, ch->origin, ch->origin))
 							occluded = true;
 			}
 			if(occluded)