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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2004-08-17 20:38:24 +00:00
parent 0cb47d0bb4
commit 671a563e22
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenManager.cpp
+4 -15
View File
@@ -101,7 +101,8 @@ ScreenSystemLayer::ScreenSystemLayer() : Screen("ScreenSystemLayer")
m_SkipBackground.StretchTo(RectF(SKIP_LEFT-8, SKIP_TOP-8, m_SkipBackground.StretchTo(RectF(SKIP_LEFT-8, SKIP_TOP-8,
SKIP_LEFT+SKIP_WIDTH, SKIP_TOP+SKIP_Y_DIST*NUM_SKIPS_TO_SHOW)); 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); this->AddChild(&m_SkipBackground);
for( int i=0; i<NUM_SKIPS_TO_SHOW; i++ ) for( int i=0; i<NUM_SKIPS_TO_SHOW; i++ )
@@ -137,6 +138,7 @@ void ScreenSystemLayer::ReloadCreditsText()
m_textTime.LoadFromFont( THEME->GetPathToF("ScreenSystemLayer time") ); m_textTime.LoadFromFont( THEME->GetPathToF("ScreenSystemLayer time") );
m_textTime.SetName( "Time" ); m_textTime.SetName( "Time" );
m_textTime.SetHidden( !PREFSMAN->m_bTimestamping );
SET_XY_AND_ON_COMMAND( m_textTime ); SET_XY_AND_ON_COMMAND( m_textTime );
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
@@ -266,16 +268,6 @@ void ScreenSystemLayer::AddTimestampLine( const CString &txt, RageColor color )
void ScreenSystemLayer::UpdateTimestampAndSkips() 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. */ /* Use our own timer, so we ignore `/tab. */
const float UpdateTime = SkipTimer.GetDeltaTime(); const float UpdateTime = SkipTimer.GetDeltaTime();
@@ -317,10 +309,7 @@ void ScreenSystemLayer::UpdateTimestampAndSkips()
} }
if( PREFSMAN->m_bTimestamping ) if( PREFSMAN->m_bTimestamping )
{ m_textTime.SetText( SecondsToMMSSMsMs(RageTimer::GetTimeSinceStart()) );
CString time(SecondsToMMSSMsMs(RageTimer::GetTimeSinceStart()));
m_textTime.SetText( time );
}
} }
void ScreenSystemLayer::Update( float fDeltaTime ) void ScreenSystemLayer::Update( float fDeltaTime )