MenuTimer cleanup

This commit is contained in:
Chris Danford
2003-03-11 21:33:11 +00:00
parent 35bf217063
commit a11de99043
19 changed files with 134 additions and 127 deletions
+3 -3
View File
@@ -610,12 +610,12 @@ void ScreenSelectMusic::HandleScreenMessage( const ScreenMessage SM )
if( m_MusicWheel.IsRouletting() )
{
MenuStart(PLAYER_INVALID);
m_Menu.m_MenuTimer.SetTimer( 15 );
m_Menu.m_MenuTimer.SetSeconds( 15 );
}
else if( m_MusicWheel.GetSelectedType() != TYPE_SONG )
{
m_MusicWheel.StartRoulette();
m_Menu.m_MenuTimer.SetTimer( 15 );
m_Menu.m_MenuTimer.SetSeconds( 15 );
}
else
{
@@ -811,7 +811,7 @@ void ScreenSelectMusic::AfterNotesChange( PlayerNumber pn )
void ScreenSelectMusic::AfterMusicChange()
{
m_Menu.m_MenuTimer.StallTimer();
m_Menu.m_MenuTimer.Stall();
Song* pSong = m_MusicWheel.GetSelectedSong();
GAMESTATE->m_pCurSong = pSong;