actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

more old cleanups: figure out data that has no specified type

Browse Source
This commit is contained in:
Glenn Maynard
2005-06-17 01:08:01 +00:00
parent fad2f95c16
commit 11044792ee
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderKSF.cpp
+26 -2
View File
@@ -122,17 +122,41 @@ bool KSFLoader::LoadFromKSFFile( const CString &sPath, Steps &out, const Song &s
if(!out.GetMeter()) out.SetMeter(5); if(!out.GetMeter()) out.SetMeter(5);
} }
out.m_StepsType = STEPS_TYPE_PUMP_SINGLE;
/* Check for "halfdouble" before "double". */ /* Check for "halfdouble" before "double". */
if( sFName.Find("halfdouble") != -1 || sFName.Find("h_double") != -1 ) if( sFName.Find("halfdouble") != -1 || sFName.Find("h_double") != -1 )
out.m_StepsType = STEPS_TYPE_PUMP_HALFDOUBLE; out.m_StepsType = STEPS_TYPE_PUMP_HALFDOUBLE;
else if( sFName.Find("double") != -1 ) else if( sFName.Find("double") != -1 )
out.m_StepsType = STEPS_TYPE_PUMP_DOUBLE; out.m_StepsType = STEPS_TYPE_PUMP_DOUBLE;
else if( sFName.Find("_1") != -1 )
out.m_StepsType = STEPS_TYPE_PUMP_SINGLE;
else if( sFName.Find("_2") != -1 ) else if( sFName.Find("_2") != -1 )
out.m_StepsType = STEPS_TYPE_PUMP_COUPLE; 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 ) switch( out.m_StepsType )
{ {
case STEPS_TYPE_PUMP_SINGLE: notedata.SetNumTracks( 5 ); break; case STEPS_TYPE_PUMP_SINGLE: notedata.SetNumTracks( 5 ); break;