| Description | Here's a patch which fixes two Soundtracker modules in SLL's Modland directory (also attached) which are currently not identified correctly.
"multi.megamix.mod" - is Ultimate Soundtracker 1.8, misidentified as SoundTracker II
- fixed(?) disk name detection - it was checking name[0] for a digit, instead of what I assumed was supposed to be name[3] or name[4]; now it just checks name[5] for a colon instead
- This module has 1xy arpeggios with param 00 (probably by mistake; it also has some 0xy which was handled already), so allow those to be considered arps instead of portamento
"digital touch.mod" - is SoundTracker III, misidentified as SoundTracker 2.x
- "emptyCmds" detection for Dxx commands no longer checks past the end of a pattern and is no longer triggered by Cxx or Exx
- D00 is only assumed to be a pattern break if it happens on an even numbered row (starting from 0), since the opposite is pretty unlikely. This fixes some instances of this module doing unnecessary D00 volume slides in pattern 5.
I also fixed a typo in "SoundTracker II" which I assume was left over from Fraggie's notes.
I couldn't find any regressions caused by any of these changes, especially since I tried to base my Dxx behavior changes on the most realistic use cases, so hopefully it keeps other ST modules working well. |
|---|
| Attached Files |
SLLfixes.patch (2,933 bytes)
diff --git OpenMPT/soundlib/Load_mod.cpp OpenMPT/soundlib/Load_mod.cpp
index 33c791a..582b648 100644
--- OpenMPT/soundlib/Load_mod.cpp
+++ OpenMPT/soundlib/Load_mod.cpp
@@ -936,7 +936,7 @@ bool CSoundFile::ReadM15(FileReader &file, ModLoadingFlags loadFlags)
totalSampleLen += Samples[smp].nLength;
- if(m_szNames[smp][0] && ((memcmp(m_szNames[smp], "st-", 3) && memcmp(m_szNames[smp], "ST-", 3)) || m_szNames[smp][0] < '0' || m_szNames[smp][0] > '9'))
+ if(m_szNames[smp][0] && ((memcmp(m_szNames[smp], "st-", 3) && memcmp(m_szNames[smp], "ST-", 3)) || m_szNames[smp][5] != ':'))
{
// Ultimate Soundtracker 1.8 and D.O.C. SoundTracker IX always have sample names containing disk names.
hasDiskNames = false;
@@ -1018,8 +1018,10 @@ bool CSoundFile::ReadM15(FileReader &file, ModLoadingFlags loadFlags)
{
uint8 data[4];
file.ReadArray(data);
+ const ROWINDEX row = i / 4;
const uint8 eff = data[2] & 0x0F, param = data[3];
- if(emptyCmds != 0 && !memcmp(data, "\0\0\0\0", 4))
+ // Check for empty space between the last Dxx command and the beginning of another pattern
+ if(emptyCmds != 0 && (row & 63) != 0 && !memcmp(data, "\0\0\0\0", 4))
{
emptyCmds++;
if(emptyCmds > 32)
@@ -1041,7 +1043,7 @@ bool CSoundFile::ReadM15(FileReader &file, ModLoadingFlags loadFlags)
{
// If a 1xx / 2xx effect has a parameter greater than 0x20, it is assumed to be UST.
minVersion = hasDiskNames ? UST1_80 : UST1_00;
- } else if(eff == 1 && param < 0x03)
+ } else if(eff == 1 && param > 0 && param < 0x03)
{
// This doesn't look like an arpeggio.
minVersion = std::max(minVersion, ST2_00_Exterminator);
@@ -1054,12 +1056,18 @@ bool CSoundFile::ReadM15(FileReader &file, ModLoadingFlags loadFlags)
case 0x0D:
case 0x0E:
minVersion = std::max(minVersion, ST2_00_Exterminator);
- if(eff == 0x0D && param == 0)
+ if(eff == 0x0D)
{
- // Assume this is a pattern break command.
- minVersion = std::max(minVersion, ST2_00);
+ emptyCmds = 1;
+ if (param == 0 && (row & 1) != 0)
+ {
+ // Assume this is a pattern break command.
+ // (now only if it's on an odd-numbered row, like it usually is.
+ // This fixes "digital touch" by SLL, which does runs of
+ // D00 D04 D08 D0F volslides repeatedly in one of its patterns)
+ minVersion = std::max(minVersion, ST2_00);
+ }
}
- emptyCmds = 1;
break;
case 0x0F:
minVersion = std::max(minVersion, ST_III);
@@ -1184,7 +1192,7 @@ bool CSoundFile::ReadM15(FileReader &file, ModLoadingFlags loadFlags)
m_madeWithTracker = "Ultimate Soundtracker 1.8-2.0";
break;
case ST2_00_Exterminator:
- m_madeWithTracker = "SoundTracker 2.0 / D.O.C. Sountracker II";
+ m_madeWithTracker = "SoundTracker 2.0 / D.O.C. SoundTracker II";
break;
case ST_III:
m_madeWithTracker = "Defjam Soundtracker III / Alpha Flight SoundTracker IV / D.O.C. SoundTracker IV / VI";
STfixes2.patch (4,787 bytes)
diff --git OpenMPT/soundlib/Load_mod.cpp OpenMPT/soundlib/Load_mod.cpp
index 33c791a..2fc250c 100644
--- OpenMPT/soundlib/Load_mod.cpp
+++ OpenMPT/soundlib/Load_mod.cpp
@@ -880,7 +880,6 @@ enum STVersions
ST_IX, // D.O.C. SoundTracker IX (Unknown/D.O.C.)
MST1_00, // Master Soundtracker 1.0 (Tip/The New Masters)
ST2_00, // SoundTracker 2.0, 2.1, 2.2 (Unknown/D.O.C.)
- ST2_00_with_Bxx, // Bxx effect found, so definitely SoundTracker 2.0, 2.1, 2.2 (Unknown/D.O.C.)
};
@@ -936,7 +935,7 @@ bool CSoundFile::ReadM15(FileReader &file, ModLoadingFlags loadFlags)
totalSampleLen += Samples[smp].nLength;
- if(m_szNames[smp][0] && ((memcmp(m_szNames[smp], "st-", 3) && memcmp(m_szNames[smp], "ST-", 3)) || m_szNames[smp][0] < '0' || m_szNames[smp][0] > '9'))
+ if(m_szNames[smp][0] && ((memcmp(m_szNames[smp], "st-", 3) && memcmp(m_szNames[smp], "ST-", 3)) || m_szNames[smp][5] != ':'))
{
// Ultimate Soundtracker 1.8 and D.O.C. SoundTracker IX always have sample names containing disk names.
hasDiskNames = false;
@@ -1014,24 +1013,39 @@ bool CSoundFile::ReadM15(FileReader &file, ModLoadingFlags loadFlags)
// Scan patterns to identify Ultimate Soundtracker modules.
uint8 emptyCmds = 0;
+ uint8 numDxx = 0;
for(size_t i = 0; i < numPatterns * 64u * 4u; i++)
{
uint8 data[4];
file.ReadArray(data);
+ const ROWINDEX row = (i / 4) % 64;
const uint8 eff = data[2] & 0x0F, param = data[3];
- if(emptyCmds != 0 && !memcmp(data, "\0\0\0\0", 4))
+ // Check for empty space between the last Dxx command and the beginning of another pattern
+ if(emptyCmds != 0 && (i % (64 * 4)) != 0 && !memcmp(data, "\0\0\0\0", 4))
{
emptyCmds++;
if(emptyCmds > 32)
{
// Since there is a lot of empty space after the last Dxx command,
// we assume it's supposed to be a pattern break effect.
- minVersion = ST2_00_with_Bxx;
+ minVersion = ST2_00;
}
} else
{
emptyCmds = 0;
}
+
+ // Check for a large number of Dxx commands in the previous pattern
+ if(numDxx != 0 && (i % (64 * 4)) == 0)
+ {
+ if(numDxx < 3)
+ {
+ // not many Dxx commands in one pattern means they were probably pattern breaks
+ minVersion = ST2_00;
+ }
+
+ numDxx = 0;
+ }
switch(eff)
{
@@ -1041,25 +1055,29 @@ bool CSoundFile::ReadM15(FileReader &file, ModLoadingFlags loadFlags)
{
// If a 1xx / 2xx effect has a parameter greater than 0x20, it is assumed to be UST.
minVersion = hasDiskNames ? UST1_80 : UST1_00;
- } else if(eff == 1 && param < 0x03)
+ } else if(eff == 1 && param > 0 && param < 0x03)
{
// This doesn't look like an arpeggio.
minVersion = std::max(minVersion, ST2_00_Exterminator);
}
break;
case 0x0B:
- minVersion = ST2_00_with_Bxx;
+ minVersion = ST2_00;
break;
case 0x0C:
case 0x0D:
case 0x0E:
minVersion = std::max(minVersion, ST2_00_Exterminator);
- if(eff == 0x0D && param == 0)
+ if(eff == 0x0D)
{
- // Assume this is a pattern break command.
- minVersion = std::max(minVersion, ST2_00);
+ emptyCmds = 1;
+ if(param == 0 && row == 0)
+ {
+ // Fix a possible tracking mistake in Blood Money title - who wants to do a pattern break on the first row anyway?
+ break;
+ }
+ numDxx++;
}
- emptyCmds = 1;
break;
case 0x0F:
minVersion = std::max(minVersion, ST_III);
@@ -1107,14 +1125,10 @@ bool CSoundFile::ReadM15(FileReader &file, ModLoadingFlags loadFlags)
}
if(m.command == 0x0D)
{
- if((m.param != 0 && minVersion != ST2_00_with_Bxx) || minVersion < ST_IX)
+ if(minVersion != ST2_00)
{
// Dxy is volume slide in some Soundtracker versions, D00 is a pattern break in the latest versions.
m.command = 0x0A;
- } else if(m.param == 0 && row == 0 && minVersion != ST2_00_with_Bxx)
- {
- // Fix a possible tracking mistake in Blood Money title - who wants to do a pattern break on the first row anyway?
- m.command = m.param = 0;
} else
{
m.param = 0;
@@ -1184,7 +1198,7 @@ bool CSoundFile::ReadM15(FileReader &file, ModLoadingFlags loadFlags)
m_madeWithTracker = "Ultimate Soundtracker 1.8-2.0";
break;
case ST2_00_Exterminator:
- m_madeWithTracker = "SoundTracker 2.0 / D.O.C. Sountracker II";
+ m_madeWithTracker = "SoundTracker 2.0 / D.O.C. SoundTracker II";
break;
case ST_III:
m_madeWithTracker = "Defjam Soundtracker III / Alpha Flight SoundTracker IV / D.O.C. SoundTracker IV / VI";
@@ -1196,7 +1210,6 @@ bool CSoundFile::ReadM15(FileReader &file, ModLoadingFlags loadFlags)
m_madeWithTracker = "Master Soundtracker 1.0";
break;
case ST2_00:
- case ST2_00_with_Bxx:
m_madeWithTracker = "SoundTracker 2.0 / 2.1 / 2.2";
break;
}
|
|---|
