Only unchose steps if menutimer have more than 10 seconds, twoparttimerseconds and allowing to unchose the song makes a "infinite timer" bug

This commit is contained in:
Marcio Barrientos
2012-11-26 15:16:00 -06:00
parent 8151c86de4
commit 072f096214
+10 -7
View File
@@ -845,13 +845,16 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
else
{
// XXX: should this be called "TwoPartCancelled"?
Message msg("SongUnchosen");
msg.SetParam( "Player", input.pn );
MESSAGEMAN->Broadcast( msg );
// unset all steps
FOREACH_ENUM( PlayerNumber , p )
m_bStepsChosen[p] = false;
m_SelectionState = SelectionState_SelectingSong;
float fSeconds = m_MenuTimer->GetSeconds();
if( fSeconds > 10 ) {
Message msg("SongUnchosen");
msg.SetParam( "Player", input.pn );
MESSAGEMAN->Broadcast( msg );
// unset all steps
FOREACH_ENUM( PlayerNumber , p )
m_bStepsChosen[p] = false;
m_SelectionState = SelectionState_SelectingSong;
}
}
}
}