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

Add metric to determine default lyrics color

Browse Source
This commit is contained in:
Aaron VonderHaar
2003-09-07 20:51:46 +00:00
parent 76711921e6
commit 9da20ccf14
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1
View File
@@ -927,6 +927,7 @@ LyricsReverseY=100
# This is used if one player is in reverse and the other isn't. # This is used if one player is in reverse and the other isn't.
LyricsOneReverseX=320 LyricsOneReverseX=320
LyricsOneReverseY=35 LyricsOneReverseY=35
LyricsDefaultColor=0,1,0,1
ActiveItemsP1X=0 ActiveItemsP1X=0
ActiveItemsP1Y=0 ActiveItemsP1Y=0
ActiveItemsP1OnCommand= ActiveItemsP1OnCommand=
stepmania/src/LyricsLoader.cpp
+4 -1
View File
@@ -7,11 +7,14 @@
#include "RageException.h" #include "RageException.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "LyricsLoader.h" #include "LyricsLoader.h"
#include "ThemeManager.h"
#include "RageFile.h" #include "RageFile.h"
#include <map> #include <map>
using namespace std; using namespace std;
#define LYRICS_DEFAULT_COLOR THEME->GetMetricC("ScreenGameplay","LyricsDefaultColor")
static int CompareLyricSegments(const LyricSegment &seg1, const LyricSegment &seg2) static int CompareLyricSegments(const LyricSegment &seg1, const LyricSegment &seg2)
{ {
return seg1.m_fStartTime < seg2.m_fStartTime; return seg1.m_fStartTime < seg2.m_fStartTime;
@@ -30,7 +33,7 @@ bool LyricsLoader::LoadFromLRCFile( CString sPath, Song &out )
string line; string line;
RageColor CurrentColor(0,1,0,1); RageColor CurrentColor = LYRICS_DEFAULT_COLOR;
out.m_LyricSegments.clear(); out.m_LyricSegments.clear();