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

clean up input logic, don't be performing music wheel actions if a song was already chosen

Browse Source
This commit is contained in:
Chris Danford
2004-01-18 04:45:59 +00:00
parent 0a34c30419
commit c53f175d14
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMusic.cpp
+22 -25
View File
@@ -638,7 +638,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
{ {
// LOG->Trace( "ScreenSelectMusic::Input()" ); // LOG->Trace( "ScreenSelectMusic::Input()" );
// debugging?
if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == SDLK_F9 ) if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == SDLK_F9 )
{ {
if( type != IET_FIRST_PRESS ) return; if( type != IET_FIRST_PRESS ) return;
@@ -650,10 +650,30 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
return; return;
} }
if( !GameI.IsValid() ) return; // don't care
if( m_bMadeChoice && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() )
{
if(m_bGoToOptions) return; /* got it already */
if(!m_bAllowOptionsMenu) return; /* not allowed */
if( !m_bAllowOptionsMenuRepeat &&
(type == IET_SLOW_REPEAT || type == IET_FAST_REPEAT ))
return; /* not allowed yet */
m_bGoToOptions = true;
m_sprOptionsMessage.SetState( 1 );
SOUND->PlayOnce( THEME->GetPathToS("Common start") );
return;
}
if( m_Menu.IsTransitioning() )
return; // ignore
if( m_bMadeChoice ) return; // ignore
if( MenuI.button == MENU_BUTTON_RIGHT || MenuI.button == MENU_BUTTON_LEFT ) if( MenuI.button == MENU_BUTTON_RIGHT || MenuI.button == MENU_BUTTON_LEFT )
{ {
if( !GAMESTATE->IsHumanPlayer(MenuI.player) ) return;
/* If we're rouletting, hands off. */ /* If we're rouletting, hands off. */
if(m_MusicWheel.IsRouletting()) if(m_MusicWheel.IsRouletting())
@@ -712,29 +732,6 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, InputEventType type,
} }
} }
if( type == IET_RELEASE ) return; // don't care
if( !GameI.IsValid() ) return; // don't care
if( m_bMadeChoice && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() )
{
if(m_bGoToOptions) return; /* got it already */
if(!m_bAllowOptionsMenu) return; /* not allowed */
if( !m_bAllowOptionsMenuRepeat &&
(type == IET_SLOW_REPEAT || type == IET_FAST_REPEAT ))
return; /* not allowed yet */
m_bGoToOptions = true;
m_sprOptionsMessage.SetState( 1 );
SOUND->PlayOnce( THEME->GetPathToS("Common start") );
return;
}
if( m_Menu.IsTransitioning() ) return; // ignore
if( m_bMadeChoice )
return;
PlayerNumber pn = GAMESTATE->GetCurrentStyleDef()->ControllerToPlayerNumber( GameI.controller ); PlayerNumber pn = GAMESTATE->GetCurrentStyleDef()->ControllerToPlayerNumber( GameI.controller );