From c50b1bddaf49b9e050451a943b369d3b1572d449 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 14 Aug 2006 22:05:53 +0000 Subject: [PATCH] different metrics for banner and mask --- stepmania/Themes/default/metrics.ini | 4 ++++ stepmania/src/ScreenSelectMusic.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index dfbe04d841..b3b08bc5cd 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -466,6 +466,10 @@ BannerOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 BannerOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 BannerWidth=256 BannerHeight=80 +BannerMaskX=SCREEN_CENTER_X-180-SCREEN_WIDTH*0.6 +BannerMaskY=SCREEN_CENTER_Y-84 +BannerMaskOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 +BannerMaskOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 BannerFrameX=SCREEN_CENTER_X-180-SCREEN_WIDTH*0.6 BannerFrameY=SCREEN_CENTER_Y-97 BannerFrameOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index a9635fe04c..d0e8e355d0 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -128,7 +128,7 @@ void ScreenSelectMusic::Init() SET_XY( m_MusicWheel ); this->AddChild( &m_MusicWheel ); - m_sprBannerMask.SetName( "Banner" ); // use the same metrics and animation as Banner + m_sprBannerMask.SetName( "BannerMask" ); m_sprBannerMask.Load( THEME->GetPathG(m_sName,"banner mask") ); m_sprBannerMask.SetBlendMode( BLEND_NO_EFFECT ); // don't draw to color buffer m_sprBannerMask.SetZWrite( true ); // do draw to the zbuffer