Remove the long list of manually typed numbers.

Again, relying on global constants here.
This commit is contained in:
Jason Felds
2011-04-29 13:45:13 -04:00
parent bbe90468b4
commit cd31dd73d8
2 changed files with 16 additions and 2 deletions
+1 -2
View File
@@ -510,8 +510,7 @@ static MenuDef g_AreaMenu(
static MenuDef g_StepsInformation(
"ScreenMiniMenuStepsInformation",
MenuRowDef( ScreenEdit::difficulty, "Difficulty", true, EditMode_Practice, true, true, 0, NULL ),
// xxx: this giant list of numbers SUUUUUUUUUUCKS -aj
MenuRowDef( ScreenEdit::meter, "Meter", true, EditMode_Practice, true, false, 0, "1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25" ),
MenuRowDef( ScreenEdit::meter, "Meter", true, EditMode_Practice, true, false, 0, MIN_METER, MAX_METER ),
MenuRowDef( ScreenEdit::description, "Description", true, EditMode_Practice, true, true, 0, NULL ),
MenuRowDef( ScreenEdit::chartstyle, "Chart Style", true, EditMode_Practice, true, true, 0, NULL ),
MenuRowDef( ScreenEdit::step_credit, "Step Author", true, EditMode_Practice, true, true, 0, NULL ),
+15
View File
@@ -4,6 +4,7 @@
#define SCREEN_MINI_MENU_H
#include "ScreenOptions.h"
#include <sstream>
#include "GameConstantsAndTypes.h"
typedef bool (*MenuRowUpdateEnabled)();
@@ -76,6 +77,20 @@ struct MenuRowDef
PUSH(c23);PUSH(c23);PUSH(c24);PUSH(c25);
#undef PUSH
}
MenuRowDef( int r, RString n, bool e, EditMode s, bool bTT, bool bTI,
int d, int low, int high ):
iRowCode(r), sName(n), bEnabled(e), pfnEnabled(NULL),
emShowIn(s), iDefaultChoice(d), choices(),
bThemeTitle(bTT), bThemeItems(bTI)
{
for ( int i = low; i <= high; i++ )
{
std::stringstream ss;
ss << i;
choices.push_back(ss.str().c_str());
}
}
void SetOneUnthemedChoice( const RString &sChoice )
{