From d41dfbc9e736de3ad24428856bb99f922182fdb4 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 19 Mar 2003 22:48:43 +0000
Subject: [PATCH] move lyrics in reverse

---
 stepmania/Themes/default/metrics.ini | 7 +++++--
 stepmania/src/ScreenGameplay.cpp     | 9 ++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 20ac9a06ba..d54ebf6372 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -430,6 +430,11 @@ DifficultyP2Y=410
 DifficultyP2ReverseY=58
 DifficultyP2ExtraY=420
 DifficultyP2ExtraReverseY=70
+LyricsX=320
+LyricsY=400
+LyricsReverseY=100
+LyricsExtraY=400
+LyricsExtraReverseY=400
 ActiveItemsP1X=0
 ActiveItemsP1Y=0
 ActiveItemsP1ReverseY=0
@@ -449,8 +454,6 @@ AutoPlayY=400
 SecondsBetweenComments=10
 DemonstrationSeconds=30
 TickEarlySeconds=0.05
-LyricsX=320
-LyricsY=400
 
 [ScreenEvaluation]
 SongSelectScreen=ScreenSelectMusic
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 358887b8c6..23a9fa32b5 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -37,8 +37,6 @@
 //
 // Defines
 //
-#define LYRICS_X						THEME->GetMetricF("ScreenGameplay","LyricsX")
-#define LYRICS_Y						THEME->GetMetricF("ScreenGameplay","LyricsY")
 #define SONGSEL_SCREEN					THEME->GetMetric("ScreenGameplay","SongSelectScreen")
 #define MAXCOMBO_X						THEME->GetMetricF("ScreenGameplay","MaxComboX")
 #define MAXCOMBO_Y						THEME->GetMetricF("ScreenGameplay","MaxComboY")
@@ -70,6 +68,8 @@
 #define SONG_OPTIONS_Y( e )				THEME->GetMetricF("ScreenGameplay",ssprintf("SongOptions%sY",e?"Extra":""))
 #define DIFFICULTY_X( p )				THEME->GetMetricF("ScreenGameplay",ssprintf("DifficultyP%dX",p+1))
 #define DIFFICULTY_Y( p, e, r )			THEME->GetMetricF("ScreenGameplay",ssprintf("DifficultyP%d%s%sY",p+1,e?"Extra":"",r?"Reverse":""))
+#define LYRICS_X						THEME->GetMetricF("ScreenGameplay",ssprintf("LyricsX"))
+#define LYRICS_Y( e, r )				THEME->GetMetricF("ScreenGameplay",ssprintf("Lyrics%s%sY",e?"Extra":"",r?"Reverse":""))
 #define ACTIVE_ITEMS_X( p )				THEME->GetMetricF("ScreenGameplay",ssprintf("ActiveItemsP%dX",p+1))
 #define ACTIVE_ITEMS_Y( p, e, r )		THEME->GetMetricF("ScreenGameplay",ssprintf("ActiveItemsP%d%s%sY",p+1,e?"Extra":"",r?"Reverse":""))
 #define DEBUG_X							THEME->GetMetricF("ScreenGameplay","DebugX")
@@ -402,7 +402,6 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
 	}
 
 
-	m_LyricDisplay.SetXY( LYRICS_X,LYRICS_Y );
 	this->AddChild(&m_LyricDisplay);
 	
 
@@ -651,6 +650,10 @@ void ScreenGameplay::LoadNextSong()
 		m_DifficultyIcon[p].SetXY( DIFFICULTY_X(p), DIFFICULTY_Y(p,bExtra,bReverse[p]) );
 	}
 
+	/* XXX: We want to put the lyrics out of the way, but it's likely that one
+	 * player is in reverse and the other isn't.  What to do? */
+	m_LyricDisplay.SetXY( LYRICS_X, LYRICS_Y(bExtra,bReverse[GAMESTATE->m_MasterPlayerNumber]) );
+
 	m_soundMusic.Load( GAMESTATE->m_pCurSong->GetMusicPath() );
 
 	// Load lyrics