From 1989e70fb1e4d5a8d4ab4abc1db548735e53024e Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 20 Oct 2002 20:16:03 +0000 Subject: [PATCH] Removed assert in OptionIconRow that was triggering if there were more options than icons. --- stepmania/src/OptionIconRow.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stepmania/src/OptionIconRow.cpp b/stepmania/src/OptionIconRow.cpp index 7b2a5d4e7f..f0b8b0c20e 100644 --- a/stepmania/src/OptionIconRow.cpp +++ b/stepmania/src/OptionIconRow.cpp @@ -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