Unwrap. Also make start only trigger on the first press. Without this, alt-enter will start the song.

This commit is contained in:
Steve Checkoway
2006-09-15 02:28:05 +00:00
parent 23221ec7bf
commit 88baa838a8
+42 -44
View File
@@ -453,53 +453,51 @@ void ScreenSelectMusic::Input( const InputEventPlus &input )
} }
if( input.type == IET_FIRST_PRESS ) if( input.type != IET_FIRST_PRESS )
return;
if( CodeDetector::EnteredEasierDifficulty(input.GameI.controller) )
{ {
if( CodeDetector::EnteredEasierDifficulty(input.GameI.controller) ) if( GAMESTATE->IsAnExtraStage() )
{ m_soundLocked.Play();
if( GAMESTATE->IsAnExtraStage() ) else
m_soundLocked.Play(); ChangeDifficulty( pn, -1 );
else return;
ChangeDifficulty( pn, -1 ); }
return; if( CodeDetector::EnteredHarderDifficulty(input.GameI.controller) )
} {
if( CodeDetector::EnteredHarderDifficulty(input.GameI.controller) ) if( GAMESTATE->IsAnExtraStage() )
{ m_soundLocked.Play();
if( GAMESTATE->IsAnExtraStage() ) else
m_soundLocked.Play(); ChangeDifficulty( pn, +1 );
else return;
ChangeDifficulty( pn, +1 ); }
return; if( CodeDetector::EnteredModeMenu(input.GameI.controller) )
} {
if( CodeDetector::EnteredModeMenu(input.GameI.controller) ) if( MODE_MENU_AVAILABLE )
{ m_MusicWheel.ChangeSort( SORT_MODE_MENU );
if( MODE_MENU_AVAILABLE ) else
m_MusicWheel.ChangeSort( SORT_MODE_MENU ); m_soundLocked.Play();
else return;
m_soundLocked.Play(); }
return; if( CodeDetector::EnteredNextSort(input.GameI.controller) )
} {
if( CodeDetector::EnteredNextSort(input.GameI.controller) ) if( ( GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage ) || GAMESTATE->IsExtraStage2() )
{ m_soundLocked.Play();
if( ( GAMESTATE->IsExtraStage() && !PREFSMAN->m_bPickExtraStage ) || GAMESTATE->IsExtraStage2() ) else
m_soundLocked.Play(); m_MusicWheel.NextSort();
else return;
m_MusicWheel.NextSort(); }
return; if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() && CodeDetector::DetectAndAdjustMusicOptions(input.GameI.controller) )
} {
if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() && CodeDetector::DetectAndAdjustMusicOptions(input.GameI.controller) ) m_soundOptionsChange.Play();
{ MESSAGEMAN->Broadcast( ssprintf("PlayerOptionsChangedP%i", pn+1) );
m_soundOptionsChange.Play(); MESSAGEMAN->Broadcast( "SongOptionsChanged" );
MESSAGEMAN->Broadcast( ssprintf("PlayerOptionsChangedP%i", pn+1) ); return;
MESSAGEMAN->Broadcast( "SongOptionsChanged" );
return;
}
} }
switch( input.MenuI ) if( input.MenuI == MENU_BUTTON_START )
{ MenuStart( input );
case MENU_BUTTON_START: MenuStart( input ); break;
}
} }
void ScreenSelectMusic::UpdateSelectButton() void ScreenSelectMusic::UpdateSelectButton()