Removed assert in OptionIconRow that was triggering if there were more options than icons.

This commit is contained in:
Chris Danford
2002-10-20 20:16:03 +00:00
parent ea9a5be821
commit 1989e70fb1
+4 -2
View File
@@ -79,8 +79,7 @@ int OptionToPreferredColumn( CString sOptionText )
if( g_OptionColumnEntries[i].szString == sOptionText )
return g_OptionColumnEntries[i].iSlotIndex;
LOG->Trace("Unknown option: \"%s\"", sOptionText );
ASSERT(0); // we encountered an option that isn't in our lookup table. You should add it above.
LOG->Warn("Unknown option: \"%s\"", sOptionText );
return -1;
}
@@ -103,6 +102,9 @@ void OptionIconRow::Refresh( PlayerNumber pn )
CString sOption = asOptions[i];
int iPerferredCol = OptionToPreferredColumn( sOption );
if( iPerferredCol == -1 )
continue; // skip
// search for a vacant spot
for( int i=iPerferredCol; i<NUM_OPTION_COLS-1; i++ )
{