hmm. This part doesn't look right (using notedata.GetNumTracks before

setting it); since I havn't heard any complaints about this and I don't remember
which data it was trying to fix, revert it to assuming unidentified steps are
singles.
This commit is contained in:
Glenn Maynard
2005-06-17 01:10:52 +00:00
parent 11044792ee
commit e44a329cd1
+2 -24
View File
@@ -122,6 +122,8 @@ bool KSFLoader::LoadFromKSFFile( const CString &sPath, Steps &out, const Song &s
if(!out.GetMeter()) out.SetMeter(5);
}
out.m_StepsType = STEPS_TYPE_PUMP_SINGLE;
/* Check for "halfdouble" before "double". */
if( sFName.Find("halfdouble") != -1 || sFName.Find("h_double") != -1 )
out.m_StepsType = STEPS_TYPE_PUMP_HALFDOUBLE;
@@ -133,30 +135,6 @@ bool KSFLoader::LoadFromKSFFile( const CString &sPath, Steps &out, const Song &s
out.m_StepsType = STEPS_TYPE_PUMP_COUPLE;
}
if( out.m_StepsType == STEPS_TYPE_INVALID )
{
/* The filename didn't contain the StepsType. Choose singles or doubles based
* upon whether the doubles-only tracks contain taps or holds. */
bool bIsSingles = true;
for( unsigned r=0; bIsSingles && r < asRows.size(); r++ )
{
CString& sRowString = asRows[r];
StripCrnl( sRowString );
if( sRowString.size() != 13 )
continue;
if( sRowString == "2222222222222" )
break;
for( int t=4; t < notedata.GetNumTracks(); t++ )
if( sRowString[t] == '1' || sRowString[t] == '4' )
bIsSingles = false;
}
if( bIsSingles )
out.m_StepsType = STEPS_TYPE_PUMP_SINGLE;
else
out.m_StepsType = STEPS_TYPE_PUMP_DOUBLE;
}
switch( out.m_StepsType )
{
case STEPS_TYPE_PUMP_SINGLE: notedata.SetNumTracks( 5 ); break;