From 9e338d3a5cb7f89a687dbef57bff50ca3a6b5c24 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 20 Mar 2003 18:51:14 +0000 Subject: [PATCH] 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 ...) --- stepmania/src/ScreenGameplay.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index fbaef64489..3f4c077a43 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -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)