row reload fixes
This commit is contained in:
Chris Danford
2005-02-26 11:19:19 +00:00
parent 10ad53d845
commit 0bcaeb0c43
4 changed files with 123 additions and 89 deletions
+2 -7
View File
@@ -136,13 +136,8 @@ void ScreenOptionsMaster::ImportOptionsForPlayer( PlayerNumber pn )
for( unsigned i = 0; i < OptionRowHandlers.size(); ++i )
{
const OptionRowHandler *pHand = OptionRowHandlers[i];
const OptionRowDefinition &def = m_OptionRowAlloc[i];
OptionRow &row = *m_Rows[i];
if( def.bOneChoiceForAllPlayers )
continue;
pHand->ImportOption( def, pn, row.m_vbSelected[pn] );
row.ImportOptions( pn );
}
}
@@ -244,7 +239,7 @@ void ScreenOptionsMaster::HandleScreenMessage( const ScreenMessage SM )
OptionRowHandler *pHand = OptionRowHandlers[r];
const int iChoice = row.m_iChoiceInRowWithFocus[GAMESTATE->m_MasterPlayerNumber];
const int iChoice = row.GetChoiceInRowWithFocus(GAMESTATE->m_MasterPlayerNumber);
CString sScreen = pHand->GetAndEraseScreen( iChoice );
if( !sScreen.empty() )
m_sNextScreen = sScreen;