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

cleanup StepsType enum names

Browse Source
This commit is contained in:
Chris Danford
2008-12-21 01:53:48 +00:00
parent 01979945d3
commit e3155aec51
17 changed files with 163 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderKSF.cpp
+10 -10
View File
@@ -136,25 +136,25 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
if( !out.GetMeter() ) out.SetMeter( 8 );
}
out.m_StepsType = STEPS_TYPE_PUMP_SINGLE;
out.m_StepsType = StepsType_pump_single;
/* Check for "halfdouble" before "double". */
if( sFName.find("halfdouble") != string::npos || sFName.find("h_double") != string::npos )
out.m_StepsType = STEPS_TYPE_PUMP_HALFDOUBLE;
out.m_StepsType = StepsType_pump_halfdouble;
else if( sFName.find("double") != string::npos || sFName.find("nightmare") != string::npos )
out.m_StepsType = STEPS_TYPE_PUMP_DOUBLE;
out.m_StepsType = StepsType_pump_double;
else if( sFName.find("_1") != string::npos )
out.m_StepsType = STEPS_TYPE_PUMP_SINGLE;
out.m_StepsType = StepsType_pump_single;
else if( sFName.find("_2") != string::npos )
out.m_StepsType = STEPS_TYPE_PUMP_COUPLE;
out.m_StepsType = StepsType_pump_couple;
}
switch( out.m_StepsType )
{
case STEPS_TYPE_PUMP_SINGLE: notedata.SetNumTracks( 5 ); break;
case STEPS_TYPE_PUMP_COUPLE: notedata.SetNumTracks( 10 ); break;
case STEPS_TYPE_PUMP_DOUBLE: notedata.SetNumTracks( 10 ); break;
case STEPS_TYPE_PUMP_HALFDOUBLE: notedata.SetNumTracks( 6 ); break;
case StepsType_pump_single: notedata.SetNumTracks( 5 ); break;
case StepsType_pump_couple: notedata.SetNumTracks( 10 ); break;
case StepsType_pump_double: notedata.SetNumTracks( 10 ); break;
case StepsType_pump_halfdouble: notedata.SetNumTracks( 6 ); break;
default: FAIL_M( ssprintf("%i", out.m_StepsType) );
}
@@ -221,7 +221,7 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
}
/* Half-doubles is offset; "0011111100000". */
if( out.m_StepsType == STEPS_TYPE_PUMP_HALFDOUBLE )
if( out.m_StepsType == StepsType_pump_halfdouble )
sRowString.erase( 0, 2 );
// Update TICKCOUNT for Direct Move files.