diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 156917698b..d1452c9030 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -927,6 +927,7 @@ LyricsReverseY=100 # This is used if one player is in reverse and the other isn't. LyricsOneReverseX=320 LyricsOneReverseY=35 +LyricsDefaultColor=0,1,0,1 ActiveItemsP1X=0 ActiveItemsP1Y=0 ActiveItemsP1OnCommand= diff --git a/stepmania/src/LyricsLoader.cpp b/stepmania/src/LyricsLoader.cpp index cd5fe5a7ce..211ef9d579 100644 --- a/stepmania/src/LyricsLoader.cpp +++ b/stepmania/src/LyricsLoader.cpp @@ -7,11 +7,14 @@ #include "RageException.h" #include "RageUtil.h" #include "LyricsLoader.h" +#include "ThemeManager.h" #include "RageFile.h" #include using namespace std; +#define LYRICS_DEFAULT_COLOR THEME->GetMetricC("ScreenGameplay","LyricsDefaultColor") + static int CompareLyricSegments(const LyricSegment &seg1, const LyricSegment &seg2) { return seg1.m_fStartTime < seg2.m_fStartTime; @@ -30,7 +33,7 @@ bool LyricsLoader::LoadFromLRCFile( CString sPath, Song &out ) string line; - RageColor CurrentColor(0,1,0,1); + RageColor CurrentColor = LYRICS_DEFAULT_COLOR; out.m_LyricSegments.clear();