Skip to content

Commit

Permalink
external libs/libmodplug: fix -Wmisleading-indentation warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
sezero committed Nov 24, 2019
1 parent 71a0d5d commit 02eed8b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
7 changes: 3 additions & 4 deletions external/libmodplug-0.8.9.0/src/load_669.cpp
Expand Up @@ -26,7 +26,6 @@ typedef struct tagFILEHEADER669
BYTE breaks[128];
} FILEHEADER669;


typedef struct tagSAMPLE669
{
BYTE filename[13];
Expand Down Expand Up @@ -156,9 +155,9 @@ BOOL CSoundFile::Read669(const BYTE *lpStream, DWORD dwMemLength)
case 0x04: command = CMD_VIBRATO; param |= 0x40; break;
case 0x05: if (param) command = CMD_SPEED; else command = 0; param += 2; break;
case 0x06: if (param == 0) { command = CMD_PANNINGSLIDE; param = 0xFE; }
else if (param == 1) { command = CMD_PANNINGSLIDE; param = 0xEF; }
else command = 0;
break;
else if (param == 1) { command = CMD_PANNINGSLIDE; param = 0xEF; }
else command = 0;
break;
default: command = 0;
}
if (command)
Expand Down
3 changes: 2 additions & 1 deletion external/libmodplug-0.8.9.0/src/load_dmf.cpp
Expand Up @@ -279,7 +279,8 @@ BOOL CSoundFile::ReadDMF(const BYTE *lpStream, DWORD dwMemLength)
case 8: cmd.command = CMD_VIBRATO; cmd.param = eval; break;
// 12: Note cut
case 12: if (eval & 0xe0) { cmd.command = CMD_S3MCMDEX; cmd.param = (eval>>5)|0xc0; }
else if (!cmd.note) { cmd.note = 0xfe; } break;
else if (!cmd.note) { cmd.note = 0xfe; }
break;
#ifdef DMFLOG
default: Log("FX2: %02X.%02X\n", efx, eval);
#endif
Expand Down
4 changes: 3 additions & 1 deletion external/libmodplug-0.8.9.0/src/load_mod.cpp
Expand Up @@ -39,7 +39,9 @@ void CSoundFile::ConvertModCommand(MODCOMMAND *m) const
case 0x0D: command = CMD_PATTERNBREAK; param = ((param >> 4) * 10) + (param & 0x0F); break;
case 0x0E: command = CMD_MODCMDEX; break;
case 0x0F: command = (param <= (UINT)((m_nType & (MOD_TYPE_XM|MOD_TYPE_MT2)) ? 0x1F : 0x20)) ? CMD_SPEED : CMD_TEMPO;
if ((param == 0xFF) && (m_nSamples == 15)) command = 0; break;
if((param == 0xFF) && (m_nSamples == 15))
command = 0;
break;
// Extension for XM extended effects
case 'G' - 55: command = CMD_GLOBALVOLUME; break;
case 'H' - 55: command = CMD_GLOBALVOLSLIDE; if (param & 0xF0) param &= 0xF0; break;
Expand Down

0 comments on commit 02eed8b

Please sign in to comment.