Cleanup of theme element names

Renamed ScreenSelectMax* back to their old names
Replaced all hard-coded transitions with TransitionBGAnimations
This commit is contained in:
Chris Danford
2003-03-09 00:55:49 +00:00
parent 86b0b1e7d7
commit 31aa613295
207 changed files with 1529 additions and 2246 deletions
+9 -4
View File
@@ -27,8 +27,8 @@ MenuTimer::MenuTimer()
m_fStallSeconds = 0;
m_bTimerStopped = false;
m_textDigit1.LoadFromNumbers( THEME->GetPathTo("Numbers","menu timer numbers") );
m_textDigit2.LoadFromNumbers( THEME->GetPathTo("Numbers","menu timer numbers") );
m_textDigit1.LoadFromNumbers( THEME->GetPathTo("Numbers","MenuTimer numbers") );
m_textDigit2.LoadFromNumbers( THEME->GetPathTo("Numbers","MenuTimer numbers") );
m_textDigit1.EnableShadow( false );
m_textDigit2.EnableShadow( false );
@@ -42,7 +42,7 @@ MenuTimer::MenuTimer()
this->AddChild( &m_textDigit1 );
this->AddChild( &m_textDigit2 );
m_soundBeep.Load( THEME->GetPathTo("Sounds","menu timer") );
m_soundBeep.Load( THEME->GetPathTo("Sounds","MenuTimer tick") );
}
void MenuTimer::StealthTimer( int iActive )
@@ -112,7 +112,12 @@ void MenuTimer::Update( float fDeltaTime )
float fRemainder = m_fSecondsLeft - (int)m_fSecondsLeft;
float fDistFromNearestNumber = min( fRemainder, 1-fRemainder ); // this is between 0 and 0.5;
if( m_fSecondsLeft < 4.5f )
if( m_fSecondsLeft == 0 )
{
m_textDigit1.SetZoomX( 1 );
m_textDigit2.SetZoomX( 1 );
}
else if( m_fSecondsLeft < 4.5f )
{
m_textDigit1.SetZoomX( min(1, fDistFromNearestNumber*8) );
m_textDigit2.SetZoomX( min(1, fDistFromNearestNumber*8) );