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

cleanup

Browse Source
This commit is contained in:
Chris Danford
2005-05-04 09:59:59 +00:00
parent 80e732f718
commit 9b2760994d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MenuTimer.cpp
+10 -8
View File
@@ -74,24 +74,26 @@ void MenuTimer::Update( float fDeltaTime )
m_fSecondsLeft = max( 0, m_fSecondsLeft ); m_fSecondsLeft = max( 0, m_fSecondsLeft );
const float fNewSecondsLeft = m_fSecondsLeft; const float fNewSecondsLeft = m_fSecondsLeft;
SetText( fNewSecondsLeft );
if( fOldSecondsLeft == fNewSecondsLeft ) if( fOldSecondsLeft == fNewSecondsLeft )
return; return;
if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5 if( fOldSecondsLeft > 5.5 && fNewSecondsLeft < 5.5 ) // transition to below 5.5
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("hurry up") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("hurry up") );
SetText( fNewSecondsLeft );
for( int s=0; s<WARNING_START; s++ ) int iCrossed = (int)floorf(fOldSecondsLeft);
if( fOldSecondsLeft > iCrossed && fNewSecondsLeft < iCrossed ) // crossed
{ {
if( fOldSecondsLeft > s && fNewSecondsLeft < s ) // crossed if( iCrossed < WARNING_START )
{ {
for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ ) for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ )
m_text[i].RunCommands( WARNING_COMMAND.GetValue(s) ); m_text[i].RunCommands( WARNING_COMMAND.GetValue(iCrossed) );
if( i <= WARNING_BEEP_START && m_soundBeep.IsLoaded() )
m_soundBeep.Play();
} }
if( iCrossed <= WARNING_BEEP_START && m_soundBeep.IsLoaded() )
m_soundBeep.Play();
} }
if( fNewSecondsLeft == 0 ) if( fNewSecondsLeft == 0 )
@@ -119,7 +121,7 @@ void MenuTimer::Stop()
void MenuTimer::Disable() void MenuTimer::Disable()
{ {
SetSeconds( 99 ); SetSeconds( TIMER_PAUSE_SECONDS );
Pause(); Pause();
} }