From 9d7cacc8ddb65030db7c564cf15cf1f0b0dece89 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Tue, 29 Jun 2021 17:24:33 +0300
Subject: [PATCH] external libs, libmodplug: fixed two -Wshadow warnings.
---
external/libmodplug-0.8.9.0/src/load_mdl.cpp | 6 +++---
external/libmodplug-0.8.9.0/src/snd_fx.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/external/libmodplug-0.8.9.0/src/load_mdl.cpp b/external/libmodplug-0.8.9.0/src/load_mdl.cpp
index 7e9f43b9..c8176d8a 100644
--- a/external/libmodplug-0.8.9.0/src/load_mdl.cpp
+++ b/external/libmodplug-0.8.9.0/src/load_mdl.cpp
@@ -402,12 +402,12 @@ BOOL CSoundFile::ReadMDL(const BYTE *lpStream, DWORD dwMemLength)
dwPos = dwMemPos;
for (i=1; i<=m_nSamples; i++) if ((Ins[i].nLength) && (!Ins[i].pSample) && (smpinfo[i] != 3) && (dwPos < dwMemLength))
{
- const BYTE *pp = lpStream + dwPos;
MODINSTRUMENT *pins = &Ins[i];
UINT flags = (pins->uFlags & CHN_16BIT) ? RS_PCM16S : RS_PCM8S;
+ pp = lpStream + dwPos;
if (!smpinfo[i])
{
- dwPos += ReadSample(pins, flags, (LPSTR)pp, dwMemLength - dwPos);
+ dwPos += ReadSample(pins, flags, (LPCSTR)pp, dwMemLength - dwPos);
} else
{
DWORD dwLen = pp[0] | (pp[1] << 8) | (pp[2] << 16) | (pp[3] << 24); pp += 4;
@@ -415,7 +415,7 @@ BOOL CSoundFile::ReadMDL(const BYTE *lpStream, DWORD dwMemLength)
if ((dwLen <= dwMemLength) && (dwPos <= dwMemLength - dwLen) && (dwLen > 4))
{
flags = (pins->uFlags & CHN_16BIT) ? RS_MDL16 : RS_MDL8;
- ReadSample(pins, flags, (LPSTR)pp, dwLen);
+ ReadSample(pins, flags, (LPCSTR)pp, dwLen);
}
dwPos += dwLen;
}
diff --git a/external/libmodplug-0.8.9.0/src/snd_fx.cpp b/external/libmodplug-0.8.9.0/src/snd_fx.cpp
index 7e0f6829..a0e907b4 100644
--- a/external/libmodplug-0.8.9.0/src/snd_fx.cpp
+++ b/external/libmodplug-0.8.9.0/src/snd_fx.cpp
@@ -701,7 +701,7 @@ void CSoundFile::CheckNNA(UINT nChn, UINT instr, int note, BOOL bForceCut)
UINT n = GetNNAChannel(nChn);
if (n)
{
- MODCHANNEL *p = &Chn[n];
+ p = &Chn[n];
// Copy Channel
*p = *pChn;
p->dwFlags &= ~(CHN_VIBRATO|CHN_TREMOLO|CHN_PANBRELLO|CHN_MUTE|CHN_PORTAMENTO);