Redo Glenn's changes I just wiped out.

stepmania/src/NotesLoaderSM.cpp

@@ -30,6 +30,16 @@ void SMLoader::LoadFromSMTokens(
 	out.m_NotesType = GameManager::StringToNotesType(sNotesType);
 	out.SetDescription(sDescription);
 	out.SetDifficulty(StringToDifficulty( sDifficulty ));
+
+	// HACK:  We used to store SMANIAC as DIFFICULTY_HARD with special description.
+	// Now, it has it's own DIFFICULTY_CHALLENGE
+	if( sDescription.CompareNoCase("smaniac") == 0 ) 
+		out.SetDifficulty( DIFFICULTY_CHALLENGE );
+	// HACK:  We used to store CHALLENGE as DIFFICULTY_HARD with special description.
+	// Now, it has it's own DIFFICULTY_CHALLENGE
+	if( sDescription.CompareNoCase("challenge") == 0 ) 
+		out.SetDifficulty( DIFFICULTY_CHALLENGE );
+
 	out.SetMeter(atoi(sMeter));
 	CStringArray saValues;
 	split( sRadarValues, ",", saValues, true );

stepmania/src/ScreenEvaluation.cpp

@@ -196,7 +196,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
 			{
 				if( !GAMESTATE->IsPlayerEnabled(p) )
 					continue;	// skip
-				m_DifficultyIcon[p].Load( THEME->GetPathTo("graphics","select music difficulty icons 1x6") );
+				m_DifficultyIcon[p].Load( THEME->GetPathTo("graphics","evaluation difficulty icons 1x5") );
 				m_DifficultyIcon[p].SetFromNotes( (PlayerNumber)p, GAMESTATE->m_pCurNotes[p] );
 				m_DifficultyIcon[p].SetXY( DIFFICULTY_ICON_X(p), DIFFICULTY_ICON_Y(p) );
 				this->AddChild( &m_DifficultyIcon[p] );

stepmania/src/ScreenGraphicOptions.cpp

@@ -86,29 +86,11 @@ ScreenGraphicOptions::ScreenGraphicOptions() :
 		g_GraphicOptionsLines, 
 		NUM_GRAPHIC_OPTIONS_LINES,
 		false );
-	UpdateRefreshRates();
 	m_Menu.StopTimer();
 
 	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","graphic options music") );
 }
 
-
-void ScreenGraphicOptions::UpdateRefreshRates()
-{
-	/* If we're windowed, leave all refresh rates dimmed, but don't
-	 * change the actual selection. */
-	if(m_iSelectedOption[0][GO_WINDOWED])
-		return;
-
-//	PositionUnderlines();
-}
-
-void ScreenGraphicOptions::OnChange()
-{
-	ScreenOptions::OnChange();
-	UpdateRefreshRates();
-}
-
 void ScreenGraphicOptions::ImportOptions()
 {
 	m_iSelectedOption[0][GO_WINDOWED]				= PREFSMAN->m_bWindowed ? 1:0;

stepmania/src/ScreenGraphicOptions.h

@@ -21,7 +21,6 @@ public:
 private:
 	void UpdateRefreshRates();
 
-	void OnChange();
 	void ImportOptions();
 	void ExportOptions();
 

stepmania/src/ScreenSelectGame.cpp

@@ -60,7 +60,6 @@ ScreenSelectGame::ScreenSelectGame() :
 		g_SelectGameLines, 
 		NUM_SELECT_GAME_LINES,
 		false );
-	m_Menu.SetTimer( 99 );
 	m_Menu.StopTimer();
 
 	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select game music") );

stepmania/src/Song.cpp

@@ -692,6 +692,9 @@ void Song::ReCalulateRadarValuesAndLastBeat()
 		ttab.push_back(TitleTrans("^Sakura$", "", "", "&sakura;", "", "") );
 
 		/* XXX: "door of magic" (tobira no mahou) -> 魔法の扉 */
+        ttab.push_back(TitleTrans("^Door of Magic$", "", "", "&mahou1;&mahou2;&hno;&tobira;", "", "") ); 
+        ttab.push_back(TitleTrans("^mahou no tobira$", "", "", "&mahou1;&mahou2;&hno;&tobira;", "", "") ); 
+
 		/* XXX スペース★マコのテーマ (space? special? * "mako"?'s team) (title or subtitle, not sure) */
 
 		/* Subtitles: */