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

fix lyrics (command names are now case sensitive), and cleanup lyrics names

Browse Source
This commit is contained in:
Chris Danford
2009-04-03 17:39:49 +00:00
parent 949a1ea89d
commit 79a24f159d
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/Scripts/Lyrics.lua
+1 -1
View File
@@ -1,4 +1,4 @@
function Actor:lyriccommand(side) function Actor:LyricCommand(side)
self:settext( Var "LyricText" ); self:settext( Var "LyricText" );
self:stoptweening(); self:stoptweening();
stepmania/Themes/default/metrics.ini
+5 -4
View File
@@ -744,11 +744,11 @@ StepsDisplayP2OnCommand=
StepsDisplayP2OffCommand=linear,0.5;addx,200 StepsDisplayP2OffCommand=linear,0.5;addx,200
StepsDisplayP2SetReverseCommand=y,SCREEN_CENTER_Y-196;addy,-100;linear,1;addy,100 StepsDisplayP2SetReverseCommand=y,SCREEN_CENTER_Y-196;addy,-100;linear,1;addy,100
StepsDisplayP2SetNoReverseCommand=y,SCREEN_CENTER_Y+174;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 LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+160
LyricsSetReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-140 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. # 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 LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-205
LyricsDefaultColor=color("0,1,0,1") LyricDisplayDefaultColor=color("0,1,0,1")
ActiveAttackListP1X= ActiveAttackListP1X=
ActiveAttackListP1Y= ActiveAttackListP1Y=
@@ -1600,6 +1600,7 @@ Fallback="Screen"
[ScreenSyncOverlay] [ScreenSyncOverlay]
Class="ScreenSyncOverlay" Class="ScreenSyncOverlay"
Fallback="Screen" Fallback="Screen"
StatusOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+150;shadowlength,2;
SyncInfoOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y; SyncInfoOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y;
[ScreenStatsOverlay] [ScreenStatsOverlay]
stepmania/src/LyricsLoader.cpp
+2 -1
View File
@@ -8,7 +8,8 @@
#include <map> #include <map>
#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) static int CompareLyricSegments(const LyricSegment &seg1, const LyricSegment &seg2)
{ {
stepmania/src/ScreenGameplay.cpp
+1 -1
View File
@@ -657,7 +657,7 @@ void ScreenGameplay::Init()
if( g_bShowLyrics ) if( g_bShowLyrics )
{ {
m_LyricDisplay.SetName( "Lyrics" ); m_LyricDisplay.SetName( "LyricDisplay" );
LOAD_ALL_COMMANDS( m_LyricDisplay ); LOAD_ALL_COMMANDS( m_LyricDisplay );
this->AddChild( &m_LyricDisplay ); this->AddChild( &m_LyricDisplay );
} }