From 79a24f159dac97fbb43cf751a8095d4f90e3eca1 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 3 Apr 2009 17:39:49 +0000 Subject: [PATCH] fix lyrics (command names are now case sensitive), and cleanup lyrics names --- stepmania/Themes/default/Scripts/Lyrics.lua | 2 +- stepmania/Themes/default/metrics.ini | 9 +++++---- stepmania/src/LyricsLoader.cpp | 3 ++- stepmania/src/ScreenGameplay.cpp | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/stepmania/Themes/default/Scripts/Lyrics.lua b/stepmania/Themes/default/Scripts/Lyrics.lua index ba1d1b2648..48eb5c146c 100644 --- a/stepmania/Themes/default/Scripts/Lyrics.lua +++ b/stepmania/Themes/default/Scripts/Lyrics.lua @@ -1,4 +1,4 @@ -function Actor:lyriccommand(side) +function Actor:LyricCommand(side) self:settext( Var "LyricText" ); self:stoptweening(); diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 420c24e024..6b9dae88cd 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -744,11 +744,11 @@ StepsDisplayP2OnCommand= StepsDisplayP2OffCommand=linear,0.5;addx,200 StepsDisplayP2SetReverseCommand=y,SCREEN_CENTER_Y-196;addy,-100;linear,1;addy,100 StepsDisplayP2SetNoReverseCommand=y,SCREEN_CENTER_Y+174;addy,100;linear,1;addy,-100 -LyricsSetNoReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+160 -LyricsSetReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-140 +LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+160 +LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-140 # This is used if one player is in reverse and the other isn't. -LyricsSetOneReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-205 -LyricsDefaultColor=color("0,1,0,1") +LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-205 +LyricDisplayDefaultColor=color("0,1,0,1") ActiveAttackListP1X= ActiveAttackListP1Y= @@ -1600,6 +1600,7 @@ Fallback="Screen" [ScreenSyncOverlay] Class="ScreenSyncOverlay" Fallback="Screen" +StatusOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+150;shadowlength,2; SyncInfoOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y; [ScreenStatsOverlay] diff --git a/stepmania/src/LyricsLoader.cpp b/stepmania/src/LyricsLoader.cpp index d9b08a30ce..86cf9800d6 100644 --- a/stepmania/src/LyricsLoader.cpp +++ b/stepmania/src/LyricsLoader.cpp @@ -8,7 +8,8 @@ #include -#define LYRICS_DEFAULT_COLOR THEME->GetMetricC("ScreenGameplay","LyricsDefaultColor") +// TODO: Use marker for default color instead of a specific color that may accidetnally get written back into a lyrics file. +#define LYRICS_DEFAULT_COLOR THEME->GetMetricC("ScreenGameplay","LyricDisplayDefaultColor") static int CompareLyricSegments(const LyricSegment &seg1, const LyricSegment &seg2) { diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index b99a2e3813..b0f9895b13 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -657,7 +657,7 @@ void ScreenGameplay::Init() if( g_bShowLyrics ) { - m_LyricDisplay.SetName( "Lyrics" ); + m_LyricDisplay.SetName( "LyricDisplay" ); LOAD_ALL_COMMANDS( m_LyricDisplay ); this->AddChild( &m_LyricDisplay ); }