X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_mix.c;h=a006f68f7fac6ed1dceeb284b8eeb9b3402321eb;hb=ce7388dfed07cfe65f8e407da5d328d002f80c21;hp=cb47d1bf2262aad832826a33eccf12f5fe870364;hpb=c86a55816acf520997179020a3ba55fcb5c1ca26;p=xonotic%2Fdarkplaces.git

diff --git a/snd_mix.c b/snd_mix.c
index cb47d1bf..a006f68f 100644
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -21,10 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-#ifdef _WIN32
-#include "winquake.h"
-#endif
-
 // LordHavoc: was 512, expanded to 2048
 #define	PAINTBUFFER_SIZE 2048
 portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE];
@@ -354,7 +350,7 @@ void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
 {
 	int *lscale, *rscale;
 	unsigned char *sfx;
-	int i;
+	int i, n;
 
 	if (ch->leftvol > 255)
 		ch->leftvol = 255;
@@ -367,22 +363,20 @@ void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
 	{
 		// LordHavoc: stereo sound support, and optimizations
 		sfx = (unsigned char *)sc->data + ch->pos * 2;
-
-		for (i=0 ; i<count ; i++)
+		for (i = 0;i < count;i++)
 		{
 			paintbuffer[i].left += lscale[*sfx++];
 			paintbuffer[i].right += rscale[*sfx++];
 		}
-		
 	}
 	else
 	{
 		sfx = (unsigned char *)sc->data + ch->pos;
-
-		for (i=0 ; i<count ; i++)
+		for (i = 0;i < count;i++)
 		{
-			paintbuffer[i].left += lscale[*sfx];
-			paintbuffer[i].right += rscale[*sfx++];
+			n = *sfx++;
+			paintbuffer[i].left += lscale[n];
+			paintbuffer[i].right += rscale[n];
 		}
 
 	}