gosu 1.4.4 → 1.4.5

data/dependencies/SDL_sound/libmodplug/load_xm.c

@@ -82,6 +82,7 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 	BOOL samples_used[MAX_SAMPLES];
 	UINT unused_samples;
 	XMFILEHEADER xmhead;
+	UINT i, j;
 
 	_this->m_nChannels = 0;
 	if ((!lpStream) || (dwMemLength < 0x200)) return FALSE;
@@ -118,7 +119,6 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 	SDL_memset(InstUsed, 0, sizeof(InstUsed));
 	if (patterns > MAX_PATTERNS)
 	{
-		UINT i, j;
 		for (i=0; i<norders; i++)
 		{
 			if (_this->Order[i] < patterns) InstUsed[_this->Order[i]] = TRUE;
@@ -142,18 +142,21 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 		}
 	} else
 	{
-		for (UINT i=0; i<256; i++) pattern_map[i] = i;
+		for (i=0; i<256; i++) pattern_map[i] = i;
 	}
 	SDL_memset(InstUsed, 0, sizeof(InstUsed));
 	dwMemPos = dwHdrSize + 60;
 	if (dwMemPos + 8 >= dwMemLength) return TRUE;
 	// Reading patterns
 	SDL_memset(channels_used, 0, sizeof(channels_used));
-	for (UINT ipat=0; ipat<patterns; ipat++)
+	for (i=0; i<patterns; i++)
 	{
-		UINT ipatmap = pattern_map[ipat];
+		MODCOMMAND *p;
+		const BYTE *src;
+		UINT ipatmap = pattern_map[i];
 		DWORD dwSize = 0;
 		WORD rows=64, packsize=0;
+		UINT row, chn;
 		dwSize = bswapLE32(*((DWORD *)(lpStream+dwMemPos)));
 		while ((dwMemPos + dwSize >= dwMemLength) || (dwSize & 0xFFFFFF00))
 		{
@@ -168,7 +171,6 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 		if (dwMemPos + dwSize + 4 > dwMemLength) return TRUE;
 		dwMemPos += dwSize;
 		if (dwMemPos + packsize + 4 > dwMemLength) return TRUE;
-		MODCOMMAND *p;
 		if (ipatmap < MAX_PATTERNS)
 		{
 			_this->PatternSize[ipatmap] = rows;
@@ -176,11 +178,11 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 			if (!packsize) continue;
 			p = _this->Patterns[ipatmap];
 		} else p = NULL;
-		const BYTE *src = lpStream+dwMemPos;
-		UINT j=0;
-		for (UINT row=0; row<rows; row++)
+		src = lpStream+dwMemPos;
+		j = 0;
+		for (row=0; row<rows; row++)
 		{
-			for (UINT chn=0; chn<_this->m_nChannels; chn++)
+			for (chn=0; chn<_this->m_nChannels; chn++)
 			{
 				if ((p) && (j < packsize))
 				{
@@ -270,28 +272,30 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 	SDL_memset(samples_used, 0, sizeof(samples_used));
 	unused_samples = 0;
 	// Reading instruments
-	for (UINT iIns=1; iIns<=instruments; iIns++)
+	for (i=1; i<=instruments; i++)
 	{
 		XMINSTRUMENTHEADER *pih;
+		INSTRUMENTHEADER *penv;
 		BYTE flags[32];
 		DWORD samplesize[32];
 		UINT samplemap[32];
-		WORD nsamples;
 		DWORD pihlen;
+		UINT newsamples, nmap;
+		WORD nsamples;
 
 		if (dwMemPos + sizeof(XMINSTRUMENTHEADER) >= dwMemLength) return TRUE;
 		pih = (XMINSTRUMENTHEADER *)(lpStream+dwMemPos);
 		pihlen = bswapLE32(pih->size);
 		if (pihlen >= dwMemLength || dwMemPos > dwMemLength - pihlen) return TRUE;
-		if ((_this->Headers[iIns] = (INSTRUMENTHEADER *) SDL_calloc(1, sizeof(INSTRUMENTHEADER))) == NULL) continue;
+		if ((_this->Headers[i] = (INSTRUMENTHEADER *) SDL_calloc(1, sizeof(INSTRUMENTHEADER))) == NULL) continue;
 		if ((nsamples = pih->samples) > 0)
 		{
 			if (dwMemPos + sizeof(XMINSTRUMENTHEADER) + sizeof(XMSAMPLEHEADER) > dwMemLength) return TRUE;
 			SDL_memcpy(&xmsh, lpStream+dwMemPos+sizeof(XMINSTRUMENTHEADER), sizeof(XMSAMPLEHEADER));
 			xmsh.shsize = bswapLE32(xmsh.shsize);
-			for (int i = 0; i < 24; ++i) {
-			  xmsh.venv[i] = bswapLE16(xmsh.venv[i]);
-			  xmsh.penv[i] = bswapLE16(xmsh.penv[i]);
+			for (j = 0; j < 24; ++j) {
+			  xmsh.venv[j] = bswapLE16(xmsh.venv[j]);
+			  xmsh.penv[j] = bswapLE16(xmsh.penv[j]);
 			}
 			xmsh.volfade = bswapLE16(xmsh.volfade);
 			xmsh.res = bswapLE16(xmsh.res);
@@ -304,8 +308,8 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 		}
 		SDL_memset(samplemap, 0, sizeof(samplemap));
 		if (nsamples > 32) return TRUE;
-		UINT newsamples = _this->m_nSamples;
-		for (UINT nmap=0; nmap<nsamples; nmap++)
+		newsamples = _this->m_nSamples;
+		for (nmap=0; nmap<nsamples; nmap++)
 		{
 			UINT n = _this->m_nSamples+nmap+1;
 			if (n >= MAX_SAMPLES)
@@ -315,14 +319,15 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 				{
 					if (!_this->Ins[n].pSample)
 					{
-						for (UINT xmapchk=0; xmapchk < nmap; xmapchk++)
+						for (j=0; j < nmap; j++)
 						{
-							if (samplemap[xmapchk] == n) goto alreadymapped;
+							if (samplemap[j] == n) goto alreadymapped;
 						}
-						for (UINT clrs=1; clrs<iIns; clrs++) if (_this->Headers[clrs])
+						for (j=1; j<i; j++) if (_this->Headers[j])
 						{
-							INSTRUMENTHEADER *pks = _this->Headers[clrs];
-							for (UINT ks=0; ks<128; ks++)
+							INSTRUMENTHEADER *pks = _this->Headers[j];
+							UINT ks=0;
+							for (; ks<128; ks++)
 							{
 								if (pks->Keyboard[ks] == n) pks->Keyboard[ks] = 0;
 							}
@@ -342,20 +347,22 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 					}
 					if ((unused_samples) && (unused_samples != 0xFFFF))
 					{
-						for (UINT iext=_this->m_nSamples; iext>=1; iext--) if (!samples_used[iext])
+						UINT iext=_this->m_nSamples;
+						for (; iext>=1; iext--) if (!samples_used[iext])
 						{
 							unused_samples--;
 							samples_used[iext] = TRUE;
 							CSoundFile_DestroySample(_this, iext);
 							n = iext;
-							for (UINT mapchk=0; mapchk<nmap; mapchk++)
+							for (j=0; j<nmap; j++)
 							{
-								if (samplemap[mapchk] == n) samplemap[mapchk] = 0;
+								if (samplemap[j] == n) samplemap[j] = 0;
 							}
-							for (UINT clrs=1; clrs<iIns; clrs++) if (_this->Headers[clrs])
+							for (j=1; j<i; j++) if (_this->Headers[j])
 							{
-								INSTRUMENTHEADER *pks = _this->Headers[clrs];
-								for (UINT ks=0; ks<128; ks++)
+								INSTRUMENTHEADER *pks = _this->Headers[j];
+								UINT ks=0;
+								for (; ks<128; ks++)
 								{
 									if (pks->Keyboard[ks] == n) pks->Keyboard[ks] = 0;
 								}
@@ -371,7 +378,7 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 		}
 		_this->m_nSamples = newsamples;
 		// Reading Volume Envelope
-		INSTRUMENTHEADER *penv = _this->Headers[iIns];
+		penv = _this->Headers[i];
 		penv->nMidiProgram = pih->type;
 		penv->nFadeOut = xmsh.volfade;
 		penv->nPan = 128;
@@ -401,37 +408,38 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 		if (penv->nPanLoopEnd >= 12) penv->nPanLoopEnd = 0;
 		if (penv->nPanLoopStart >= penv->nPanLoopEnd) penv->dwFlags &= ~ENV_PANLOOP;
 		penv->nGlobalVol = 64;
-		for (UINT ienv=0; ienv<12; ienv++)
+		for (j=0; j<12; j++)
 		{
-			penv->VolPoints[ienv] = (WORD)xmsh.venv[ienv*2];
-			penv->VolEnv[ienv] = (BYTE)xmsh.venv[ienv*2+1];
-			penv->PanPoints[ienv] = (WORD)xmsh.penv[ienv*2];
-			penv->PanEnv[ienv] = (BYTE)xmsh.penv[ienv*2+1];
-			if (ienv)
+			penv->VolPoints[j] = (WORD)xmsh.venv[j*2];
+			penv->VolEnv[j] = (BYTE)xmsh.venv[j*2+1];
+			penv->PanPoints[j] = (WORD)xmsh.penv[j*2];
+			penv->PanEnv[j] = (BYTE)xmsh.penv[j*2+1];
+			if (j)
 			{
-				if (penv->VolPoints[ienv] < penv->VolPoints[ienv-1])
+				if (penv->VolPoints[j] < penv->VolPoints[j-1])
 				{
-					penv->VolPoints[ienv] &= 0xFF;
-					penv->VolPoints[ienv] += penv->VolPoints[ienv-1] & 0xFF00;
-					if (penv->VolPoints[ienv] < penv->VolPoints[ienv-1]) penv->VolPoints[ienv] += 0x100;
+					penv->VolPoints[j] &= 0xFF;
+					penv->VolPoints[j] += penv->VolPoints[j-1] & 0xFF00;
+					if (penv->VolPoints[j] < penv->VolPoints[j-1]) penv->VolPoints[j] += 0x100;
 				}
-				if (penv->PanPoints[ienv] < penv->PanPoints[ienv-1])
+				if (penv->PanPoints[j] < penv->PanPoints[j-1])
 				{
-					penv->PanPoints[ienv] &= 0xFF;
-					penv->PanPoints[ienv] += penv->PanPoints[ienv-1] & 0xFF00;
-					if (penv->PanPoints[ienv] < penv->PanPoints[ienv-1]) penv->PanPoints[ienv] += 0x100;
+					penv->PanPoints[j] &= 0xFF;
+					penv->PanPoints[j] += penv->PanPoints[j-1] & 0xFF00;
+					if (penv->PanPoints[j] < penv->PanPoints[j-1]) penv->PanPoints[j] += 0x100;
 				}
 			}
 		}
-		for (UINT j=0; j<96; j++)
+		for (j=0; j<96; j++)
 		{
 			penv->NoteMap[j+12] = j+1+12;
 			if (xmsh.snum[j] < nsamples)
 				penv->Keyboard[j+12] = samplemap[xmsh.snum[j]];
 		}
 		// Reading samples
-		for (UINT ins=0; ins<nsamples; ins++)
+		for (j=0; j<nsamples; j++)
 		{
+			MODINSTRUMENT *pins;
 			if ((dwMemPos + sizeof(xmss) > dwMemLength)
 			 || (xmsh.shsize >= dwMemLength) || (dwMemPos > dwMemLength - xmsh.shsize)) return TRUE;
 			SDL_memcpy(&xmss, lpStream+dwMemPos, sizeof(xmss));
@@ -439,10 +447,10 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 			xmss.loopstart = bswapLE32(xmss.loopstart);
 			xmss.looplen = bswapLE32(xmss.looplen);
 			dwMemPos += xmsh.shsize;
-			flags[ins] = (xmss.type & 0x10) ? RS_PCM16D : RS_PCM8D;
-			if (xmss.type & 0x20) flags[ins] = (xmss.type & 0x10) ? RS_STPCM16D : RS_STPCM8D;
-			samplesize[ins] = xmss.samplen;
-			if (!samplemap[ins]) continue;
+			flags[j] = (xmss.type & 0x10) ? RS_PCM16D : RS_PCM8D;
+			if (xmss.type & 0x20) flags[j] = (xmss.type & 0x10) ? RS_STPCM16D : RS_STPCM8D;
+			samplesize[j] = xmss.samplen;
+			if (!samplemap[j]) continue;
 			if (xmss.type & 0x10)
 			{
 				xmss.looplen >>= 1;
@@ -460,8 +468,7 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 			xmss.looplen += xmss.loopstart;
 			if (xmss.looplen > xmss.samplen) xmss.looplen = xmss.samplen;
 			if (!xmss.looplen) xmss.type &= ~3;
-			UINT imapsmp = samplemap[ins];
-			MODINSTRUMENT *pins = &_this->Ins[imapsmp];
+			pins = &_this->Ins[samplemap[j]];
 			pins->nLength = (xmss.samplen > MAX_SAMPLE_LENGTH) ? MAX_SAMPLE_LENGTH : xmss.samplen;
 			pins->nLoopStart = xmss.loopstart;
 			pins->nLoopEnd = xmss.looplen;
@@ -477,8 +484,8 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 			pins->nGlobalVol = 64;
 			if ((xmss.res == 0xAD) && (!(xmss.type & 0x30)))
 			{
-				flags[ins] = RS_ADPCM4;
-				samplesize[ins] = (samplesize[ins]+1)/2 + 16;
+				flags[j] = RS_ADPCM4;
+				samplesize[j] = (samplesize[j]+1)/2 + 16;
 			}
 			pins->nFineTune = xmss.finetune;
 			pins->RelativeTone = (int)xmss.relnote;
@@ -489,13 +496,13 @@ BOOL CSoundFile_ReadXM(CSoundFile *_this, const BYTE *lpStream, DWORD dwMemLengt
 			pins->nVibDepth = xmsh.vibdepth;
 			pins->nVibRate = xmsh.vibrate;
 		}
-		for (UINT ismpd=0; ismpd<nsamples; ismpd++)
+		for (j=0; j<nsamples; j++)
 		{
-			if ((samplemap[ismpd]) && (samplesize[ismpd]) && (dwMemPos < dwMemLength))
+			if ((samplemap[j]) && (samplesize[j]) && (dwMemPos < dwMemLength))
 			{
-				CSoundFile_ReadSample(_this, &_this->Ins[samplemap[ismpd]], flags[ismpd], (LPSTR)(lpStream + dwMemPos), dwMemLength - dwMemPos);
+				CSoundFile_ReadSample(_this, &_this->Ins[samplemap[j]], flags[j], (LPSTR)(lpStream + dwMemPos), dwMemLength - dwMemPos);
 			}
-			dwMemPos += samplesize[ismpd];
+			dwMemPos += samplesize[j];
 			if (dwMemPos >= dwMemLength) break;
 		}
 	}

data/dependencies/SDL_sound/libmodplug/mmcmp.c

@@ -152,6 +152,7 @@ BOOL MMCMP_Unpack(LPCBYTE *ppMemFile, LPDWORD pdwMemLength)
 	LPMMCMPHEADER pmmh;
 	const DWORD *pblk_table;
 	DWORD dwFileSize;
+	UINT nBlock;
 	BYTE tmp0[32], tmp1[32];
 
 	if (PP20_Unpack(ppMemFile, pdwMemLength))
@@ -179,7 +180,7 @@ BOOL MMCMP_Unpack(LPCBYTE *ppMemFile, LPDWORD pdwMemLength)
 		return FALSE;
 	pBufEnd = pBuffer + dwFileSize;
 	pblk_table = (const DWORD *)(lpMemFile+pmmh->blktable);
-	for (UINT nBlock=0; nBlock<pmmh->nblocks; nBlock++)
+	for (nBlock = 0; nBlock < pmmh->nblocks; nBlock++)
 	{
 		DWORD dwMemPos = bswapLE32(pblk_table[nBlock]);
 		DWORD dwSubPos;

data/dependencies/SDL_sound/libmodplug/snd_dsp.c

@@ -18,6 +18,7 @@ static UINT GetMaskFromSize(UINT len)
 void CSoundFile_InitializeDSP(CSoundFile *_this, BOOL bReset)
 //-----------------------------------------
 {
+	BOOL bResetBass = FALSE;
 	if (!_this->m_nReverbDelay) _this->m_nReverbDelay = 100;
 	if (!_this->m_nXBassRange) _this->m_nXBassRange = XBASS_DELAY;
 	if (!_this->m_nProLogicDelay) _this->m_nProLogicDelay = 20;
@@ -74,13 +75,13 @@ void CSoundFile_InitializeDSP(CSoundFile *_this, BOOL bReset)
 		}
 	} else _this->nReverbSize = 0;
 #endif
-	BOOL bResetBass = FALSE;
 	// Bass Expansion Reset
 	if (_this->gdwSoundSetup & SNDMIX_MEGABASS)
 	{
 		UINT nXBassSamples = (_this->gdwMixingFreq * _this->m_nXBassRange) / 10000;
+		UINT mask;
 		if (nXBassSamples > XBASSBUFFERSIZE) nXBassSamples = XBASSBUFFERSIZE;
-		UINT mask = GetMaskFromSize(nXBassSamples);
+		mask = GetMaskFromSize(nXBassSamples);
 		if ((bReset) || (mask != (UINT)_this->nXBassMask))
 		{
 			_this->nXBassMask = mask;
@@ -110,22 +111,24 @@ void CSoundFile_ProcessStereoDSP(CSoundFile *_this, int count)
 		int *pr = _this->MixSoundBuffer, *pin = _this->MixReverbBuffer, rvbcount = count;
 		do
 		{
-			int echo = _this->ReverbBuffer[_this->nReverbBufferPos] + _this->ReverbBuffer2[_this->nReverbBufferPos2]
+			int echo, echodly, n, tmp, v, vlp;
+
+			echo = _this->ReverbBuffer[_this->nReverbBufferPos] + _this->ReverbBuffer2[_this->nReverbBufferPos2]
 					+ _this->ReverbBuffer3[_this->nReverbBufferPos3] + _this->ReverbBuffer4[_this->nReverbBufferPos4];	// echo = reverb signal
 			// Delay line and remove Low Frequencies			// v = original signal
-			int echodly = _this->ReverbLoFilterDelay[_this->nReverbLoDlyPos];	// echodly = delayed signal
+			echodly = _this->ReverbLoFilterDelay[_this->nReverbLoDlyPos];	// echodly = delayed signal
 			_this->ReverbLoFilterDelay[_this->nReverbLoDlyPos] = echo >> 1;
 			_this->nReverbLoDlyPos++;
 			_this->nReverbLoDlyPos &= 0x1F;
-			int n = _this->nReverbLoFltPos;
+			n = _this->nReverbLoFltPos;
 			_this->nReverbLoFltSum -= _this->ReverbLoFilterBuffer[n];
-			int tmp = echo / 128;
+			tmp = echo / 128;
 			_this->ReverbLoFilterBuffer[n] = tmp;
 			_this->nReverbLoFltSum += tmp;
 			echodly -= _this->nReverbLoFltSum;
 			_this->nReverbLoFltPos = (n + 1) & 0x3F;
 			// Reverb
-			int v = (pin[0]+pin[1]) >> _this->nFilterAttn;
+			v = (pin[0]+pin[1]) >> _this->nFilterAttn;
 			pr[0] += pin[0] + echodly;
 			pr[1] += pin[1] + echodly;
 			v += echodly >> 2;
@@ -138,7 +141,7 @@ void CSoundFile_ProcessStereoDSP(CSoundFile *_this, int count)
 			_this->gRvbLowPass[_this->gRvbLPPos] = v;
 			_this->gRvbLPPos++;
 			_this->gRvbLPPos &= 7;
-			const int vlp = _this->gRvbLPSum >> 2;
+			vlp = _this->gRvbLPSum >> 2;
 			_this->ReverbBuffer[_this->nReverbBufferPos] = vlp;
 			_this->ReverbBuffer2[_this->nReverbBufferPos2] = vlp;
 			if (++_this->nReverbBufferPos >= _this->nReverbSize) _this->nReverbBufferPos = 0;
@@ -154,9 +157,11 @@ void CSoundFile_ProcessStereoDSP(CSoundFile *_this, int count)
 	if (_this->gdwSoundSetup & SNDMIX_SURROUND)
 	{
 		int *pr = _this->MixSoundBuffer, n = _this->nDolbyLoFltPos;
-		for (int r=count; r; r--)
+		int   r = count;
+		for (; r; r--)
 		{
-			int v = (pr[0]+pr[1]+DOLBYATTNROUNDUP) >> (nDolbyHiFltAttn+1);
+			int v, secho, tmp;
+			v = (pr[0]+pr[1]+DOLBYATTNROUNDUP) >> (nDolbyHiFltAttn+1);
 			v *= (int)_this->nDolbyDepth;
 			// Low-Pass Filter
 			_this->nDolbyHiFltSum -= _this->DolbyHiFilterBuffer[_this->nDolbyHiFltPos];
@@ -166,7 +171,7 @@ void CSoundFile_ProcessStereoDSP(CSoundFile *_this, int count)
 			_this->nDolbyHiFltPos++;
 			_this->nDolbyHiFltPos &= nDolbyHiFltMask;
 			// Surround
-			int secho = _this->SurroundBuffer[_this->nSurroundPos];
+			secho = _this->SurroundBuffer[_this->nSurroundPos];
 			_this->SurroundBuffer[_this->nSurroundPos] = v;
 			// Delay line and remove low frequencies
 			v = _this->DolbyLoFilterDelay[_this->nDolbyLoDlyPos];		// v = delayed signal
@@ -174,7 +179,7 @@ void CSoundFile_ProcessStereoDSP(CSoundFile *_this, int count)
 			_this->nDolbyLoDlyPos++;
 			_this->nDolbyLoDlyPos &= 0x1F;
 			_this->nDolbyLoFltSum -= _this->DolbyLoFilterBuffer[n];
-			int tmp = secho / 64;
+			tmp = secho / 64;
 			_this->DolbyLoFilterBuffer[n] = tmp;
 			_this->nDolbyLoFltSum += tmp;
 			v -= _this->nDolbyLoFltSum;
@@ -194,14 +199,16 @@ void CSoundFile_ProcessStereoDSP(CSoundFile *_this, int count)
 		int *px = _this->MixSoundBuffer;
 		int xba = _this->m_nXBassDepth+1, xbamask = (1 << xba) - 1;
 		int n = _this->nXBassBufferPos;
-		for (int x=count; x; x--)
+		int x = count;
+		for (; x; x--)
 		{
+			int tmp0, tmp, v;
 			_this->nXBassSum -= _this->XBassBuffer[n];
-			int tmp0 = px[0] + px[1];
-			int tmp = (tmp0 + ((tmp0 >> 31) & xbamask)) >> xba;
+			tmp0 = px[0] + px[1];
+			tmp = (tmp0 + ((tmp0 >> 31) & xbamask)) >> xba;
 			_this->XBassBuffer[n] = tmp;
 			_this->nXBassSum += tmp;
-			int v = _this->XBassDelay[_this->nXBassDlyPos];
+			v = _this->XBassDelay[_this->nXBassDlyPos];
 			_this->XBassDelay[_this->nXBassDlyPos] = px[0];
 			px[0] = v + _this->nXBassSum;
 			v = _this->XBassDelay[_this->nXBassDlyPos+1];
@@ -219,7 +226,8 @@ void CSoundFile_ProcessStereoDSP(CSoundFile *_this, int count)
 	{
 		int n1 = _this->nLeftNR, n2 = _this->nRightNR;
 		int *pnr = _this->MixSoundBuffer;
-		for (int nr=count; nr; nr--)
+		int  nr = count;
+		for (; nr; nr--)
 		{
 			int vnr = pnr[0] >> 1;
 			pnr[0] = vnr + n1;
@@ -242,8 +250,9 @@ void CSoundFile_ProcessStereoDSP(CSoundFile *_this, int count)
 BOOL CSoundFile_SetReverbParameters(CSoundFile *_this, UINT nDepth, UINT nDelay)
 //------------------------------------------------------------
 {
+	UINT gain;
 	if (nDepth > 100) nDepth = 100;
-	UINT gain = nDepth / 20;
+	gain = nDepth / 20;
 	if (gain > 4) gain = 4;
 	_this->m_nReverbDepth = 4 - gain;
 	if (nDelay < 40) nDelay = 40;
@@ -257,11 +266,12 @@ BOOL CSoundFile_SetReverbParameters(CSoundFile *_this, UINT nDepth, UINT nDelay)
 BOOL CSoundFile_SetXBassParameters(CSoundFile *_this, UINT nDepth, UINT nRange)
 //-----------------------------------------------------------
 {
+	UINT gain, range;
 	if (nDepth > 100) nDepth = 100;
-	UINT gain = nDepth / 20;
+	gain = nDepth / 20;
 	if (gain > 4) gain = 4;
 	_this->m_nXBassDepth = 8 - gain;	// filter attenuation 1/256 .. 1/16
-	UINT range = nRange / 5;
+	range = nRange / 5;
 	if (range > 5) range -= 5; else range = 0;
 	if (nRange > 16) nRange = 16;
 	_this->m_nXBassRange = 21 - range;	// filter average on 0.5-1.6ms

data/dependencies/SDL_sound/libmodplug/snd_flt.c

@@ -16,12 +16,13 @@ static DWORD CutOffToFrequency(CSoundFile *_this, UINT nCutOff, int flt_modifier
 //-----------------------------------------------------------------------
 {
 	float Fc;
+	LONG freq;
 
 	if (_this->m_dwSongFlags & SONG_EXFILTERRANGE)
 		Fc = 110.0f * SDL_pow(2.0f, 0.25f + ((float)(nCutOff*(flt_modifier+256)))/(21.0f*512.0f));
 	else
 		Fc = 110.0f * SDL_pow(2.0f, 0.25f + ((float)(nCutOff*(flt_modifier+256)))/(24.0f*512.0f));
-	LONG freq = (LONG)Fc;
+	freq = (LONG)Fc;
 	if (freq < 120) return 120;
 	if (freq > 10000) return 10000;
 	if (freq*2 > (LONG)_this->gdwMixingFreq) freq = _this->gdwMixingFreq>>1;
@@ -36,13 +37,14 @@ void CSoundFile_SetupChannelFilter(CSoundFile *_this, MODCHANNEL *pChn, BOOL bRe
 	float fc = (float)CutOffToFrequency(_this, pChn->nCutOff, flt_modifier);
 	float fs = (float)_this->gdwMixingFreq;
 	float fg, fb0, fb1;
+	float dmpfac, d, e;
 
 	fc *= (float)(2.0*3.14159265358/fs);
-	float dmpfac = SDL_pow(10.0f, -((24.0f / 128.0f)*(float)pChn->nResonance) / 20.0f);
-	float d = (1.0f-2.0f*dmpfac)* fc;
+	dmpfac = SDL_pow(10.0f, -((24.0f / 128.0f)*(float)pChn->nResonance) / 20.0f);
+	d = (1.0f-2.0f*dmpfac)* fc;
 	if (d>2.0) d = 2.0;
 	d = (2.0f*dmpfac - d)/fc;
-	float e = SDL_pow(1.0f/fc,2.0f);
+	e = SDL_pow(1.0f/fc,2.0f);
 
 	fg=1/(1+d+e);
 	fb0=(d+e+e)/(1+d+e);