actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

move lyrics in reverse

Browse Source
This commit is contained in:
Glenn Maynard
2003-03-19 22:48:43 +00:00
parent cdbd4da0c3
commit d41dfbc9e7
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+5 -2
View File
@@ -430,6 +430,11 @@ DifficultyP2Y=410
DifficultyP2ReverseY=58 DifficultyP2ReverseY=58
DifficultyP2ExtraY=420 DifficultyP2ExtraY=420
DifficultyP2ExtraReverseY=70 DifficultyP2ExtraReverseY=70
LyricsX=320
LyricsY=400
LyricsReverseY=100
LyricsExtraY=400
LyricsExtraReverseY=400
ActiveItemsP1X=0 ActiveItemsP1X=0
ActiveItemsP1Y=0 ActiveItemsP1Y=0
ActiveItemsP1ReverseY=0 ActiveItemsP1ReverseY=0
@@ -449,8 +454,6 @@ AutoPlayY=400
SecondsBetweenComments=10 SecondsBetweenComments=10
DemonstrationSeconds=30 DemonstrationSeconds=30
TickEarlySeconds=0.05 TickEarlySeconds=0.05
LyricsX=320
LyricsY=400
[ScreenEvaluation] [ScreenEvaluation]
SongSelectScreen=ScreenSelectMusic SongSelectScreen=ScreenSelectMusic
stepmania/src/ScreenGameplay.cpp
+6 -3
View File
@@ -37,8 +37,6 @@
// //
// Defines // Defines
// //
#define LYRICS_X THEME->GetMetricF("ScreenGameplay","LyricsX")
#define LYRICS_Y THEME->GetMetricF("ScreenGameplay","LyricsY")
#define SONGSEL_SCREEN THEME->GetMetric("ScreenGameplay","SongSelectScreen") #define SONGSEL_SCREEN THEME->GetMetric("ScreenGameplay","SongSelectScreen")
#define MAXCOMBO_X THEME->GetMetricF("ScreenGameplay","MaxComboX") #define MAXCOMBO_X THEME->GetMetricF("ScreenGameplay","MaxComboX")
#define MAXCOMBO_Y THEME->GetMetricF("ScreenGameplay","MaxComboY") #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 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_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 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_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 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") #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); this->AddChild(&m_LyricDisplay);
@@ -651,6 +650,10 @@ void ScreenGameplay::LoadNextSong()
m_DifficultyIcon[p].SetXY( DIFFICULTY_X(p), DIFFICULTY_Y(p,bExtra,bReverse[p]) ); 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() ); m_soundMusic.Load( GAMESTATE->m_pCurSong->GetMusicPath() );
// Load lyrics // Load lyrics