actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle speed modifiers specially, so we don't bail if we

Browse Source 
get a weird speed.

If we *do* bail, log why.
This commit is contained in:
Glenn Maynard
2002-10-18 01:35:45 +00:00
parent 191d6aa8fd
commit 5b2e497b76
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionIconRow.cpp
+9 -9
View File
@@ -14,6 +14,7 @@
#include "ThemeManager.h" #include "ThemeManager.h"
#include "PlayerOptions.h" #include "PlayerOptions.h"
#include "GameState.h" #include "GameState.h"
#include "RageLog.h"
#define SPACING_X THEME->GetMetricF("OptionIconRow","SpacingX") #define SPACING_X THEME->GetMetricF("OptionIconRow","SpacingX")
@@ -38,15 +39,6 @@ struct OptionColumnEntry
const OptionColumnEntry g_OptionColumnEntries[] = const OptionColumnEntry g_OptionColumnEntries[] =
{ {
{"0.5X", 0},
{"0.75X", 0},
{"1X", 0},
{"1.5X", 0},
{"2X", 0},
{"3X", 0},
{"4X", 0},
{"5X", 0},
{"8X", 0},
{"Boost", 0}, {"Boost", 0},
{"Wave", 1}, {"Wave", 1},
{"Drunk", 1}, {"Drunk", 1},
@@ -76,10 +68,18 @@ const int NUM_OPTION_COL_ENTRIES = sizeof(g_OptionColumnEntries)/sizeof(OptionCo
int OptionToPreferredColumn( CString sOptionText ) int OptionToPreferredColumn( CString sOptionText )
{ {
/* Speedups always go in column 0. digit ... x */
if(sOptionText.GetLength() > 1 &&
isdigit(sOptionText[0]) &&
tolower(sOptionText[sOptionText.GetLength()-1]) == 'x') {
return 0;
}
for( int i=0; i<NUM_OPTION_COL_ENTRIES; i++ ) for( int i=0; i<NUM_OPTION_COL_ENTRIES; i++ )
if( g_OptionColumnEntries[i].szString == sOptionText ) if( g_OptionColumnEntries[i].szString == sOptionText )
return g_OptionColumnEntries[i].iSlotIndex; 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. ASSERT(0); // we encountered an option that isn't in our lookup table. You should add it above.
return -1; return -1;
} }