From 0c5f9c2b668354727de625c644c8e98906566610 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Wed, 3 Aug 2011 23:11:05 -0500
Subject: [PATCH] moved format hacks from GameManager to NotesLoaderSM

---
 src/GameManager.cpp   | 11 -----------
 src/NotesLoaderSM.cpp | 10 +++++++++-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/GameManager.cpp b/src/GameManager.cpp
index 533eb41865..d5e3049393 100644
--- a/src/GameManager.cpp
+++ b/src/GameManager.cpp
@@ -3023,17 +3023,6 @@ StepsType GameManager::StringToStepsType( RString sStepsType )
 {
 	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++ )
 		if( g_StepsTypeInfos[i].szName == sStepsType )
 			return StepsType(i);
diff --git a/src/NotesLoaderSM.cpp b/src/NotesLoaderSM.cpp
index 889fafe2ce..12776584bb 100644
--- a/src/NotesLoaderSM.cpp
+++ b/src/NotesLoaderSM.cpp
@@ -75,7 +75,15 @@ void SMLoader::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.SetDescription( sDescription );
 	out.SetCredit( sDescription ); // this is often used for both.