generalize special case

This commit is contained in:
Glenn Maynard
2006-01-14 08:00:09 +00:00
parent d5a47f9af1
commit 201c4f42a8
+1 -1
View File
@@ -136,7 +136,6 @@ void ScreenOptionsMaster::BeginFadingOut()
ASSERT( iCurRow >= 0 && iCurRow < (int)m_pRows.size() ); ASSERT( iCurRow >= 0 && iCurRow < (int)m_pRows.size() );
OptionRow &row = *m_pRows[iCurRow]; OptionRow &row = *m_pRows[iCurRow];
if( row.GetRowType() != OptionRow::RowType_Exit )
{ {
int iChoice = row.GetChoiceInRowWithFocus( GAMESTATE->m_MasterPlayerNumber ); int iChoice = row.GetChoiceInRowWithFocus( GAMESTATE->m_MasterPlayerNumber );
if( row.GetFirstItemGoesDown() ) if( row.GetFirstItemGoesDown() )
@@ -144,6 +143,7 @@ void ScreenOptionsMaster::BeginFadingOut()
if( iChoice != -1 ) // not the "goes down" item if( iChoice != -1 ) // not the "goes down" item
{ {
OptionRowHandler *pHand = m_OptionRowHandlers[iCurRow]; OptionRowHandler *pHand = m_OptionRowHandlers[iCurRow];
if( pHand != NULL )
m_bExportWillSetANewScreen = pHand->HasScreen( iChoice ); m_bExportWillSetANewScreen = pHand->HasScreen( iChoice );
} }
} }