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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-16 21:44:04 +00:00
parent 282ef1a9e4
commit 786d8a4d96
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptions.cpp
+12 -9
View File
@@ -852,16 +852,10 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input )
int iCurRow = m_iCurrentRow[pn]; int iCurRow = m_iCurrentRow[pn];
OptionRow &row = *m_pRows[iCurRow]; OptionRow &row = *m_pRows[iCurRow];
//
// Check whether Start ends this screen.
//
{
bool bEndThisScreen = false;
if( m_OptionsNavigation == NAV_THREE_KEY_MENU ) if( m_OptionsNavigation == NAV_THREE_KEY_MENU )
{ {
/* In NAV_THREE_KEY_MENU mode, if a row doesn't set a screen, it does /* In NAV_THREE_KEY_MENU mode, if a row doesn't set a screen, it does
* something. Apply it now. */ * something. Apply it now, and don't go to the next screen. */
CString sScreen = GetNextScreenForSelection( input.MenuI.player ); CString sScreen = GetNextScreenForSelection( input.MenuI.player );
if( sScreen.empty() ) if( sScreen.empty() )
{ {
@@ -870,10 +864,19 @@ void ScreenOptions::ProcessMenuStart( const InputEventPlus &input )
ExportOptions( iCurRow, vpns ); ExportOptions( iCurRow, vpns );
return; return;
} }
bEndThisScreen = true;
} }
//
// Check whether Start ends this screen.
//
{
bool bEndThisScreen = false;
// If we didn't apply and return above in NAV_THREE_KEY_MENU, then the selection
// sets a screen.
if( m_OptionsNavigation == NAV_THREE_KEY_MENU )
bEndThisScreen = true;
// If there's no exit row, then pressing Start on any row ends the screen. // If there's no exit row, then pressing Start on any row ends the screen.
if( !SHOW_EXIT_ROW ) if( !SHOW_EXIT_ROW )
bEndThisScreen = true; bEndThisScreen = true;