moved format hacks from GameManager to NotesLoaderSM

This commit is contained in:
AJ Kelly
2011-08-03 23:11:05 -05:00
parent 85c9a258a6
commit 0c5f9c2b66
2 changed files with 9 additions and 12 deletions
-11
View File
@@ -3023,17 +3023,6 @@ StepsType GameManager::StringToStepsType( RString sStepsType )
{ {
sStepsType.MakeLower(); sStepsType.MakeLower();
// TODO: Format specific hacks should be moved into the file loader for that format.
// If i'm assuming this correctly, these two only apply to .sm files: -aj
// HACK: We eliminated "ez2-single-hard", but we should still handle it.
if( sStepsType == "ez2-single-hard" )
sStepsType = "ez2-single";
// HACK: "para-single" used to be called just "para"
if( sStepsType == "para" )
sStepsType = "para-single";
for( int i=0; i<NUM_StepsType; i++ ) for( int i=0; i<NUM_StepsType; i++ )
if( g_StepsTypeInfos[i].szName == sStepsType ) if( g_StepsTypeInfos[i].szName == sStepsType )
return StepsType(i); return StepsType(i);
+9 -1
View File
@@ -75,7 +75,15 @@ void SMLoader::LoadFromTokens(
// LOG->Trace( "Steps::LoadFromTokens()" ); // LOG->Trace( "Steps::LoadFromTokens()" );
// insert stepstype hacks from GameManager.cpp here? -aj // backwards compatibility hacks:
// HACK: We eliminated "ez2-single-hard", but we should still handle it.
if( sStepsType == "ez2-single-hard" )
sStepsType = "ez2-single";
// HACK: "para-single" used to be called just "para"
if( sStepsType == "para" )
sStepsType = "para-single";
out.m_StepsType = GAMEMAN->StringToStepsType( sStepsType ); out.m_StepsType = GAMEMAN->StringToStepsType( sStepsType );
out.SetDescription( sDescription ); out.SetDescription( sDescription );
out.SetCredit( sDescription ); // this is often used for both. out.SetCredit( sDescription ); // this is often used for both.