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

OptionRowHandlers were originally exclusive to SOMaster, but

Browse Source 
they're accessible by SOptions now, too.  Move this slightly
tricky next-screen logic into SOptions, since it can apply
to any screen that sets OptionRowHandlers.

(Actually, this doesn't really belong in BeginFadingOut, since
it's not called "MaybeBeginFadingOutDependingOnTheCurrentOption".
Maybe this should be done in ExportOptions, I'm not sure yet,
but this is a step in the right direction.)
This commit is contained in:
Glenn Maynard
2006-01-16 20:30:55 +00:00
parent 0d5f75e736
commit 5320b3e92e
4 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsMaster.cpp
-30
View File
@@ -102,36 +102,6 @@ void ScreenOptionsMaster::ExportOptions( int r, const vector<PlayerNumber> &vpns
m_iChangeMask |= row.ExportOptions( vpns, bRowHasFocus );
}
void ScreenOptionsMaster::BeginFadingOut()
{
/* If the selection is on a LIST, and the selected LIST option sets the screen,
* honor it. */
int iCurRow = this->GetCurrentRow();
ASSERT( iCurRow >= 0 && iCurRow < (int)m_pRows.size() );
const OptionRow &row = *m_pRows[iCurRow];
{
int iChoice = row.GetChoiceInRowWithFocus( GAMESTATE->m_MasterPlayerNumber );
if( row.GetFirstItemGoesDown() )
iChoice--;
// not the "goes down" item
if( iChoice != -1 )
{
const OptionRowHandler *pHand = row.GetHandler();
if( pHand != NULL )
{
CString sThisScreen = pHand->GetScreen( iChoice );
if( sThisScreen != "" )
m_sNextScreen = sThisScreen;
}
}
}
// If options set a NextScreen or one is specified in metrics, then fade out
if( GetNextScreen() != "" )
ScreenOptions::BeginFadingOut();
}
void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM )
{
if( SM == SM_ExportOptions )