From 671a563e22c49ff9de40f6f7bddfc441603b2d98 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 17 Aug 2004 20:38:24 +0000 Subject: [PATCH] simplify --- stepmania/src/ScreenManager.cpp | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index 997d0da865..8d4c18d5cc 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -101,7 +101,8 @@ ScreenSystemLayer::ScreenSystemLayer() : Screen("ScreenSystemLayer") m_SkipBackground.StretchTo(RectF(SKIP_LEFT-8, SKIP_TOP-8, SKIP_LEFT+SKIP_WIDTH, SKIP_TOP+SKIP_Y_DIST*NUM_SKIPS_TO_SHOW)); - m_SkipBackground.SetDiffuse( RageColor(0,0,0,0) ); + m_SkipBackground.SetDiffuse( RageColor(0,0,0,0.4f) ); + m_SkipBackground.SetHidden( !PREFSMAN->m_bTimestamping ); this->AddChild(&m_SkipBackground); for( int i=0; iGetPathToF("ScreenSystemLayer time") ); m_textTime.SetName( "Time" ); + m_textTime.SetHidden( !PREFSMAN->m_bTimestamping ); SET_XY_AND_ON_COMMAND( m_textTime ); FOREACH_PlayerNumber( p ) @@ -266,16 +268,6 @@ void ScreenSystemLayer::AddTimestampLine( const CString &txt, RageColor color ) void ScreenSystemLayer::UpdateTimestampAndSkips() { - if(!PREFSMAN->m_bTimestamping) - { - /* Hide: */ - m_textTime.SetDiffuse( RageColor(1,1,1,0) ); - m_SkipBackground.SetDiffuse( RageColor(0,0,0,0) ); - } else { - m_textTime.SetDiffuse( RageColor(1,0,1,1) ); - m_SkipBackground.SetDiffuse(RageColor(0,0,0,0.4f)); - } - /* Use our own timer, so we ignore `/tab. */ const float UpdateTime = SkipTimer.GetDeltaTime(); @@ -316,11 +308,8 @@ void ScreenSystemLayer::UpdateTimestampAndSkips() } } - if(PREFSMAN->m_bTimestamping) - { - CString time(SecondsToMMSSMsMs(RageTimer::GetTimeSinceStart())); - m_textTime.SetText( time ); - } + if( PREFSMAN->m_bTimestamping ) + m_textTime.SetText( SecondsToMMSSMsMs(RageTimer::GetTimeSinceStart()) ); } void ScreenSystemLayer::Update( float fDeltaTime )