From b92f9ef290cfc2d5563324f06692fe12c0d78175 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 21 Jan 2003 23:07:22 +0000
Subject: [PATCH] Redo Glenn's changes I just wiped out.

---
 stepmania/src/NotesLoaderSM.cpp        | 10 ++++++++++
 stepmania/src/ScreenEvaluation.cpp     |  2 +-
 stepmania/src/ScreenGraphicOptions.cpp | 18 ------------------
 stepmania/src/ScreenGraphicOptions.h   |  1 -
 stepmania/src/ScreenSelectGame.cpp     |  1 -
 stepmania/src/Song.cpp                 |  3 +++
 6 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/stepmania/src/NotesLoaderSM.cpp b/stepmania/src/NotesLoaderSM.cpp
index 147b248719..c6f18fcd5d 100644
--- a/stepmania/src/NotesLoaderSM.cpp
+++ b/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 );
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 21a3d9adbc..d7dd05a2ac 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/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] );
diff --git a/stepmania/src/ScreenGraphicOptions.cpp b/stepmania/src/ScreenGraphicOptions.cpp
index db1685e3e8..a7d416d962 100644
--- a/stepmania/src/ScreenGraphicOptions.cpp
+++ b/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;
diff --git a/stepmania/src/ScreenGraphicOptions.h b/stepmania/src/ScreenGraphicOptions.h
index 4eb647695b..c013340476 100644
--- a/stepmania/src/ScreenGraphicOptions.h
+++ b/stepmania/src/ScreenGraphicOptions.h
@@ -21,7 +21,6 @@ public:
 private:
 	void UpdateRefreshRates();
 
-	void OnChange();
 	void ImportOptions();
 	void ExportOptions();
 
diff --git a/stepmania/src/ScreenSelectGame.cpp b/stepmania/src/ScreenSelectGame.cpp
index 7e00fb4f7b..039638a963 100644
--- a/stepmania/src/ScreenSelectGame.cpp
+++ b/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") );
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index 8ddd7d823b..f08d6a496c 100644
--- a/stepmania/src/Song.cpp
+++ b/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: */