diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 709065adc0..bcfe535710 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -298,7 +298,7 @@ MeterP2OnCommand=x,228;y,432;zoomy,0;linear,0.5;zoomy,1 MeterP2OffCommand=linear,0.5;zoomy,0 WheelOnCommand=x,480;y,244 WheelOffCommand= -SongOptionsOnCommand=x,160;y,334;zoom,0.5;diffuse,1,1,1,0;linear,0.5;diffuse,1,1,1,1 +SongOptionsOnCommand=x,160;y,334;zoom,0.5;shadowlength,2;diffuse,1,1,1,0;linear,0.5;diffuse,1,1,1,1 SongOptionsOffCommand=linear,0.5;diffuse,1,1,1,0 SongOptionsExtraCommand=diffuseblink OptionIconsP1OnCommand=x,30;y,58;zoomy,0;linear,0.5;zoomy,1 @@ -646,16 +646,16 @@ TimerSeconds=20 [ScreenEvaluationSummary] // small banners -Banner1OnCommand=x,260;y,80;zoom,0.5 -Banner1OffCommand= -Banner2OnCommand=x,290;y,90;zoom,0.5 -Banner2OffCommand= -Banner3OnCommand=x,320;y,100;zoom,0.5 -Banner3OffCommand= -Banner4OnCommand=x,350;y,110;zoom,0.5 -Banner4OffCommand= -Banner5OnCommand=x,380;y,120;zoom,0.5 -Banner5OffCommand= +Banner1OnCommand=x,260;y,80;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480 +Banner1OffCommand=sleep,0.8;accelerate,0.3;yoffset,480 +Banner2OnCommand=x,290;y,90;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480 +Banner2OffCommand=sleep,0.8;accelerate,0.3;yoffset,480 +Banner3OnCommand=x,320;y,100;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480 +Banner3OffCommand=sleep,0.8;accelerate,0.3;yoffset,480 +Banner4OnCommand=x,350;y,110;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480 +Banner4OffCommand=sleep,0.8;accelerate,0.3;yoffset,480 +Banner5OnCommand=x,380;y,120;zoom,0.5;yoffset,480;sleep,0.0;decelerate,0.3;yoffset,-480 +Banner5OffCommand=sleep,0.8;accelerate,0.3;yoffset,480 StageOnCommand=diffuse,1,1,1,0 StageOffCommand= DifficultyIconP1OnCommand=diffuse,1,1,1,0 diff --git a/stepmania/src/ScreenLogo.cpp b/stepmania/src/ScreenLogo.cpp index 5f101f11e3..99fec66a02 100644 --- a/stepmania/src/ScreenLogo.cpp +++ b/stepmania/src/ScreenLogo.cpp @@ -29,14 +29,14 @@ ScreenLogo::ScreenLogo() : ScreenAttract("ScreenLogo") this->AddChild( &m_sprLogo ); m_textVersion.LoadFromFont( THEME->GetPathTo("Fonts","normal") ); - m_textVersion.SetText( "CVS" ); m_textVersion.Command( VERSION_ON_COMMAND ); + m_textVersion.SetText( "CVS" ); this->AddChild( &m_textVersion ); m_textSongs.LoadFromFont( THEME->GetPathTo("Fonts","normal") ); - m_textSongs.SetText( ssprintf("%d songs in %d groups, %d courses", SONGMAN->GetNumSongs(), SONGMAN->GetNumGroups(), SONGMAN->GetNumCourses()) ); m_textSongs.Command( SONGS_ON_COMMAND ); + m_textSongs.SetText( ssprintf("%d songs in %d groups, %d courses", SONGMAN->GetNumSongs(), SONGMAN->GetNumGroups(), SONGMAN->GetNumCourses()) ); this->AddChild( &m_textSongs ); this->MoveToTail( &m_In ); // put it in the back so it covers up the stuff we just added