fix list defaults

This commit is contained in:
Glenn Maynard
2003-09-29 09:00:59 +00:00
parent a1ac9e2326
commit 846c931438
+12 -1
View File
@@ -288,9 +288,20 @@ int ScreenOptionsMaster::ImportOption( const OptionRow &row, const OptionRowHand
{ {
case ROW_LIST: case ROW_LIST:
{ {
int ret = -1;
for( unsigned e = 0; e < hand.ListEntries.size(); ++e ) for( unsigned e = 0; e < hand.ListEntries.size(); ++e )
{ {
const ModeChoice &mc = hand.ListEntries[e]; const ModeChoice &mc = hand.ListEntries[e];
if( mc.IsZero() )
{
/* The entry has no effect. This is usually a default "none of the
* above" entry. It will always return true for DescribesCurrentMode().
* It's only the selected choice if nothing else matches. */
ret = e;
continue;
}
if( row.bOneChoiceForAllPlayers ) if( row.bOneChoiceForAllPlayers )
{ {
if( mc.DescribesCurrentModeForAllPlayers() ) if( mc.DescribesCurrentModeForAllPlayers() )
@@ -301,7 +312,7 @@ int ScreenOptionsMaster::ImportOption( const OptionRow &row, const OptionRowHand
} }
} }
return 0; return ret;
} }
case ROW_STEP: case ROW_STEP:
if( GAMESTATE->m_bEditing ) if( GAMESTATE->m_bEditing )