We're likely to want to make lyric data load elsewhere later, so don't
apply the preference here; simply don't add the lyric display instead. (Also, lyric data isn't being unloaded, which may cause the preference to not take effect on songs already played ...)
This commit is contained in:
@@ -402,7 +402,8 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
|
||||
}
|
||||
|
||||
|
||||
this->AddChild(&m_LyricDisplay);
|
||||
if(PREFSMAN->m_bShowLyrics)
|
||||
this->AddChild(&m_LyricDisplay);
|
||||
|
||||
|
||||
m_textAutoPlay.LoadFromFont( THEME->GetPathTo("Fonts","header2") );
|
||||
@@ -658,14 +659,9 @@ void ScreenGameplay::LoadNextSong()
|
||||
|
||||
// Load lyrics
|
||||
// XXX: don't load this here
|
||||
if( PREFSMAN->m_bShowLyrics == true )
|
||||
{
|
||||
LyricsLoader LL;
|
||||
if( GAMESTATE->m_pCurSong->HasLyrics() )
|
||||
{
|
||||
LL.LoadFromLRCFile(GAMESTATE->m_pCurSong->GetLyricsPath(), *GAMESTATE->m_pCurSong);
|
||||
}
|
||||
}
|
||||
LyricsLoader LL;
|
||||
if( GAMESTATE->m_pCurSong->HasLyrics() )
|
||||
LL.LoadFromLRCFile(GAMESTATE->m_pCurSong->GetLyricsPath(), *GAMESTATE->m_pCurSong);
|
||||
}
|
||||
|
||||
float ScreenGameplay::StartPlayingSong(float MinTimeToNotes, float MinTimeToMusic)
|
||||
|
||||
Reference in New Issue
Block a user