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

fix hard-coded class name

Browse Source 
fix wrapping on repeated input
This commit is contained in:
Chris Danford
2005-03-20 08:18:47 +00:00
parent a7fdca526e
commit c42caf30f3
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+22 -14
View File
@@ -204,7 +204,7 @@ void ScreenOptions::InitMenu( InputMode im, const vector<OptionRowDefinition> &v
// init highlights // init highlights
FOREACH_HumanPlayer( p ) FOREACH_HumanPlayer( p )
{ {
m_Cursor[p].Load( "ScreenOptions", OptionsCursor::cursor ); m_Cursor[p].Load( m_sName, OptionsCursor::cursor );
m_Cursor[p].Set( p ); m_Cursor[p].Set( p );
m_framePage.AddChild( &m_Cursor[p] ); m_framePage.AddChild( &m_Cursor[p] );
} }
@@ -801,16 +801,16 @@ bool ScreenOptions::AllAreOnLastRow() const
return true; return true;
} }
void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType selectType ) void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType type )
{ {
switch( selectType ) switch( type )
{ {
case IET_FIRST_PRESS: case IET_FIRST_PRESS:
m_bGotAtLeastOneStartPressed[pn] = true; m_bGotAtLeastOneStartPressed[pn] = true;
break; break;
case IET_RELEASE: case IET_RELEASE:
return; // ignore return; // ignore
default: // repeat selectType default: // repeat type
if( !m_bGotAtLeastOneStartPressed[pn] ) if( !m_bGotAtLeastOneStartPressed[pn] )
return; // don't allow repeat return; // don't allow repeat
break; break;
@@ -832,7 +832,7 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType selectType
INPUTMAPPER->IsButtonDown( MenuInput(pn, MENU_BUTTON_LEFT) ); INPUTMAPPER->IsButtonDown( MenuInput(pn, MENU_BUTTON_LEFT) );
if( bHoldingLeftAndRight ) if( bHoldingLeftAndRight )
{ {
MoveRow( pn, -1, selectType != IET_FIRST_PRESS ); MoveRow( pn, -1, type != IET_FIRST_PRESS );
return; return;
} }
} }
@@ -853,7 +853,7 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType selectType
bEndThisScreen = true; bEndThisScreen = true;
/* Don't accept START to go to the next screen if we're still transitioning in. */ /* Don't accept START to go to the next screen if we're still transitioning in. */
if( selectType != IET_FIRST_PRESS || IsTransitioning() ) if( type != IET_FIRST_PRESS || IsTransitioning() )
bEndThisScreen = false; bEndThisScreen = false;
if( bEndThisScreen ) if( bEndThisScreen )
@@ -868,7 +868,7 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType selectType
int iChoiceInRow = row.GetChoiceInRowWithFocus(pn); int iChoiceInRow = row.GetChoiceInRowWithFocus(pn);
if( iChoiceInRow == 0 ) if( iChoiceInRow == 0 )
{ {
MenuDown( pn, selectType ); MenuDown( pn, type );
return; return;
} }
} }
@@ -890,7 +890,7 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType selectType
if( row.GetFirstItemGoesDown() ) if( row.GetFirstItemGoesDown() )
{ {
// move to the first choice in the row // move to the first choice in the row
ChangeValueInRow( pn, -row.GetChoiceInRowWithFocus(pn), selectType != IET_FIRST_PRESS ); ChangeValueInRow( pn, -row.GetChoiceInRowWithFocus(pn), type != IET_FIRST_PRESS );
} }
} }
else // data.selectType != SELECT_MULTIPLE else // data.selectType != SELECT_MULTIPLE
@@ -898,7 +898,7 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType selectType
switch( m_OptionsNavigation ) switch( m_OptionsNavigation )
{ {
case NAV_THREE_KEY: case NAV_THREE_KEY:
MenuDown( pn, selectType ); MenuDown( pn, type );
break; break;
case NAV_TOGGLE_THREE_KEY: case NAV_TOGGLE_THREE_KEY:
case NAV_TOGGLE_FIVE_KEY: case NAV_TOGGLE_FIVE_KEY:
@@ -911,19 +911,19 @@ void ScreenOptions::MenuStart( PlayerNumber pn, const InputEventType selectType
row.SetOneSelection( pn, iChoiceInRow ); row.SetOneSelection( pn, iChoiceInRow );
} }
if( row.GetFirstItemGoesDown() ) if( row.GetFirstItemGoesDown() )
ChangeValueInRow( pn, -row.GetChoiceInRowWithFocus(pn), selectType != IET_FIRST_PRESS ); // move to the first choice ChangeValueInRow( pn, -row.GetChoiceInRowWithFocus(pn), type != IET_FIRST_PRESS ); // move to the first choice
else else
ChangeValueInRow( pn, 0, selectType != IET_FIRST_PRESS ); ChangeValueInRow( pn, 0, type != IET_FIRST_PRESS );
break; break;
case NAV_THREE_KEY_MENU: case NAV_THREE_KEY_MENU:
/* Don't accept START to go to the next screen if we're still transitioning in. */ /* Don't accept START to go to the next screen if we're still transitioning in. */
if( selectType == IET_FIRST_PRESS && !IsTransitioning() ) if( type == IET_FIRST_PRESS && !IsTransitioning() )
this->BeginFadingOut(); this->BeginFadingOut();
break; break;
case NAV_FIVE_KEY: case NAV_FIVE_KEY:
/* Jump to the exit row. (If everyone's already on the exit row, then /* Jump to the exit row. (If everyone's already on the exit row, then
* we'll have already gone to the next screen above.) */ * we'll have already gone to the next screen above.) */
MoveRow( pn, m_Rows.size()-m_iCurrentRow[pn]-1, selectType != IET_FIRST_PRESS ); MoveRow( pn, m_Rows.size()-m_iCurrentRow[pn]-1, type != IET_FIRST_PRESS );
break; break;
} }
} }
@@ -1136,18 +1136,26 @@ void ScreenOptions::MenuUpDown( PlayerNumber pn, const InputEventType type, int
{ {
ASSERT( iDir == -1 || iDir == +1 ); ASSERT( iDir == -1 || iDir == +1 );
bool bRepeat = type != IET_FIRST_PRESS;
int iDest = -1; int iDest = -1;
for( int r=1; r<(int)m_Rows.size(); r++ ) for( int r=1; r<(int)m_Rows.size(); r++ )
{ {
int iDelta = r*iDir; int iDelta = r*iDir;
iDest = m_iCurrentRow[pn] + iDelta; iDest = m_iCurrentRow[pn] + iDelta;
int iOldDest = iDest;
ASSERT( m_Rows.size() ); ASSERT( m_Rows.size() );
wrap( iDest, m_Rows.size() ); wrap( iDest, m_Rows.size() );
// Don't wrap on repeating inputs.
bool bWrapped = iOldDest != iDest;
if( bRepeat && bWrapped )
return;
OptionRow &row = *m_Rows[iDest]; OptionRow &row = *m_Rows[iDest];
if( row.GetRowDef().IsEnabledForPlayer(pn) ) if( row.GetRowDef().IsEnabledForPlayer(pn) )
{ {
MoveRow( pn, iDelta, type != IET_FIRST_PRESS ); MoveRow( pn, iDelta, bRepeat );
return; return;
} }
} }