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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-26 09:03:48 +00:00
parent 56cf66195c
commit 8610d7050f
2 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenTitleMenu.cpp
+21 -25
View File
@@ -177,6 +177,21 @@ ScreenTitleMenu::~ScreenTitleMenu()
} }
void ScreenTitleMenu::MoveCursor( bool up )
{
if( PREFSMAN->m_iCoinMode != COIN_HOME )
return;
if( m_BeginOut.IsTransitioning() )
return;
TimeToDemonstration.GetDeltaTime(); /* Reset the demonstration timer when a key is pressed. */
LoseFocus( m_Choice );
m_Choice = Choice( m_Choice + (up? -1:+1) );
wrap( (int&)m_Choice, (int)NUM_CHOICES );
m_soundChange.Play();
GainFocus( m_Choice );
}
void ScreenTitleMenu::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) void ScreenTitleMenu::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{ {
LOG->Trace( "ScreenTitleMenu::Input( %d-%d )", DeviceI.device, DeviceI.button ); // debugging gameport joystick problem LOG->Trace( "ScreenTitleMenu::Input( %d-%d )", DeviceI.device, DeviceI.button ); // debugging gameport joystick problem
@@ -194,42 +209,23 @@ void ScreenTitleMenu::Input( const DeviceInput& DeviceI, const InputEventType ty
if( !MenuI.IsValid() ) if( !MenuI.IsValid() )
return; return;
if( m_In.IsTransitioning() || m_Out.IsTransitioning() )
return;
switch( MenuI.button ) switch( MenuI.button )
{ {
case MENU_BUTTON_UP: case MENU_BUTTON_UP:
if( PREFSMAN->m_iCoinMode != COIN_HOME ) MoveCursor( true );
break;
if( m_In.IsTransitioning() || m_Out.IsTransitioning() || m_BeginOut.IsTransitioning() )
break;
TimeToDemonstration.GetDeltaTime(); /* Reset the demonstration timer when a key is pressed. */
LoseFocus( m_Choice );
if( m_Choice == 0 ) // wrap around
m_Choice = (Choice)((int)NUM_CHOICES);
m_Choice = Choice( m_Choice-1 );
m_soundChange.Play();
GainFocus( m_Choice );
break; break;
case MENU_BUTTON_DOWN: case MENU_BUTTON_DOWN:
if( PREFSMAN->m_iCoinMode != COIN_HOME ) MoveCursor( false );
break;
if( m_In.IsTransitioning() || m_Out.IsTransitioning() || m_BeginOut.IsTransitioning() )
break;
TimeToDemonstration.GetDeltaTime(); /* Reset the demonstration timer when a key is pressed. */
LoseFocus( m_Choice );
if( m_Choice == (int)ScreenTitleMenu::NUM_CHOICES-1 )
m_Choice = (Choice)-1; // wrap around
m_Choice = Choice( m_Choice+1 );
m_soundChange.Play();
GainFocus( m_Choice );
break; break;
case MENU_BUTTON_BACK: case MENU_BUTTON_BACK:
if( m_In.IsTransitioning() || m_Out.IsTransitioning() || m_BeginOut.IsTransitioning() ) if( m_BeginOut.IsTransitioning() )
break; break;
m_Out.StartTransitioning( SM_GoToAttractLoop ); m_Out.StartTransitioning( SM_GoToAttractLoop );
break; break;
case MENU_BUTTON_START: case MENU_BUTTON_START:
if( m_In.IsTransitioning() || m_Out.IsTransitioning() )
break;
/* break if the choice is invalid */ /* break if the choice is invalid */
if( m_Choice == CHOICE_JUKEBOX || if( m_Choice == CHOICE_JUKEBOX ||
m_Choice == CHOICE_EDIT || m_Choice == CHOICE_EDIT ||
stepmania/src/ScreenTitleMenu.h
+1
View File
@@ -67,6 +67,7 @@ public:
private: private:
void GainFocus( int iChoiceIndex ); void GainFocus( int iChoiceIndex );
void LoseFocus( int iChoiceIndex ); void LoseFocus( int iChoiceIndex );
void MoveCursor( bool up );
Choice m_Choice; Choice m_Choice;