From f0a27980d0add5963270163625ab430c96144491 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sat, 3 Jul 2010 22:06:37 -0500 Subject: [PATCH] * Step information can now show meters from 0-25. (hopefully) * MAX_METER upped to 35. --- src/GameConstantsAndTypes.h | 6 ++++-- src/ScreenEdit.cpp | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/GameConstantsAndTypes.h b/src/GameConstantsAndTypes.h index af7aa64a25..aa5584f17e 100644 --- a/src/GameConstantsAndTypes.h +++ b/src/GameConstantsAndTypes.h @@ -6,9 +6,11 @@ #include "EnumHelper.h" // Note definitions -// Use 1-20 instead of 1-13 -aj +// Use 1-35 instead of 1-13. -aj +/* 35 is used because we have to be mindful of Profile data. + * See Profile::InitGeneralData() for how MAX_METER is used. -aj */ const int MIN_METER = 1; -const int MAX_METER = 20; +const int MAX_METER = 35; // Credits const int MAX_NUM_CREDITS = 20; diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 28fae18c7d..850619dd8b 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -545,7 +545,8 @@ static MenuDef g_AreaMenu( static MenuDef g_StepsInformation( "ScreenMiniMenuStepsInformation", MenuRowDef( ScreenEdit::difficulty, "Difficulty", true, EditMode_Practice, true, true, 0, NULL ), - 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" ), + // 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::description, "Description", true, EditMode_Practice, true, true, 0, NULL ), MenuRowDef( ScreenEdit::predict_meter, "Predicted Meter", false, EditMode_Full, true, true, 0, NULL ), MenuRowDef( ScreenEdit::tap_notes, "Tap Steps", false, EditMode_Full, true, true, 0, NULL ),