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

cleanup StepsType enum names

Browse Source
This commit is contained in:
Chris Danford
2008-12-21 01:53:48 +00:00
parent 01979945d3
commit e3155aec51
17 changed files with 163 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+3 -3
View File
@@ -4621,12 +4621,12 @@ PointsHoldLetGo=-500
[CustomDifficulty] [CustomDifficulty]
Names="1,2,3" Names="1,2,3"
1StepsType="StepsType_dance-single" 1StepsType="StepsType_dance_single"
1Difficulty="Difficulty_Easy" 1Difficulty="Difficulty_Easy"
1String="Easy" 1String="Easy"
2StepsType="StepsType_pump-single" 2StepsType="StepsType_pump_single"
2Difficulty="Difficulty_Hard" 2Difficulty="Difficulty_Hard"
2String="Crazy" 2String="Crazy"
3StepsType="StepsType_pump-halfdouble" 3StepsType="StepsType_pump_halfdouble"
3Difficulty="Difficulty_Invalid" 3Difficulty="Difficulty_Invalid"
3String="HalfDouble" 3String="HalfDouble"
stepmania/src/GameConstantsAndTypes.cpp
+2
View File
@@ -46,6 +46,8 @@ LuaXType( RadarCategory );
RString StepsTypeToString( StepsType st ) RString StepsTypeToString( StepsType st )
{ {
RString s = GameManager::GetStepsTypeInfo( st ).szName; // "dance-single" RString s = GameManager::GetStepsTypeInfo( st ).szName; // "dance-single"
/* foo-bar -> Foo_Bar */
s.Replace('-','_');
return s; return s;
} }
namespace StringConversion { template<> RString ToString<StepsType>( const StepsType &value ) { return StepsTypeToString(value); } } namespace StringConversion { template<> RString ToString<StepsType>( const StepsType &value ) { return StepsTypeToString(value); } }
stepmania/src/GameConstantsAndTypes.h
+31 -31
View File
@@ -54,37 +54,37 @@ enum StepsTypeCategory
enum StepsType enum StepsType
{ {
STEPS_TYPE_DANCE_SINGLE = 0, StepsType_dance_single = 0,
STEPS_TYPE_DANCE_DOUBLE, StepsType_dance_double,
STEPS_TYPE_DANCE_COUPLE, StepsType_dance_couple,
STEPS_TYPE_DANCE_SOLO, StepsType_dance_solo,
STEPS_TYPE_DANCE_ROUTINE, StepsType_dance_routine,
STEPS_TYPE_PUMP_SINGLE, StepsType_pump_single,
STEPS_TYPE_PUMP_HALFDOUBLE, StepsType_pump_halfdouble,
STEPS_TYPE_PUMP_DOUBLE, StepsType_pump_double,
STEPS_TYPE_PUMP_COUPLE, StepsType_pump_couple,
STEPS_TYPE_KB7_SINGLE, StepsType_kb7_single,
STEPS_TYPE_EZ2_SINGLE, StepsType_ez2_single,
STEPS_TYPE_EZ2_DOUBLE, StepsType_ez2_double,
STEPS_TYPE_EZ2_REAL, StepsType_ez2_real,
STEPS_TYPE_PARA_SINGLE, StepsType_para_single,
STEPS_TYPE_DS3DDX_SINGLE, StepsType_ds3ddx_single,
STEPS_TYPE_BEAT_SINGLE5, StepsType_beat_single5,
STEPS_TYPE_BEAT_DOUBLE5, StepsType_beat_double5,
STEPS_TYPE_BEAT_SINGLE7, StepsType_beat_single7,
STEPS_TYPE_BEAT_DOUBLE7, StepsType_beat_double7,
STEPS_TYPE_MANIAX_SINGLE, StepsType_maniax_single,
STEPS_TYPE_MANIAX_DOUBLE, StepsType_maniax_double,
STEPS_TYPE_TECHNO_SINGLE4, StepsType_techno_single4,
STEPS_TYPE_TECHNO_SINGLE5, StepsType_techno_single5,
STEPS_TYPE_TECHNO_SINGLE8, StepsType_techno_single8,
STEPS_TYPE_TECHNO_DOUBLE4, StepsType_techno_double4,
STEPS_TYPE_TECHNO_DOUBLE5, StepsType_techno_double5,
STEPS_TYPE_POPN_FIVE, StepsType_popn_five,
STEPS_TYPE_POPN_NINE, StepsType_popn_nine,
STEPS_TYPE_GUITAR_FIVE, StepsType_guitar_five,
STEPS_TYPE_KARAOKE_SINGLE, StepsType_karaoke_single,
STEPS_TYPE_LIGHTS_CABINET, StepsType_lights_cabinet,
NUM_StepsType, // leave this at the end NUM_StepsType, // leave this at the end
StepsType_Invalid, StepsType_Invalid,
}; };
stepmania/src/GameManager.cpp
+43 -43
View File
@@ -111,7 +111,7 @@ static const Style g_Style_Dance_Single =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay true, // m_bUsedForHowToPlay
"single", // m_szName "single", // m_szName
STEPS_TYPE_DANCE_SINGLE, // m_StepsType StepsType_dance_single, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
4, // m_iColsPerPlayer 4, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -147,7 +147,7 @@ static const Style g_Style_Dance_Versus =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"versus", // m_szName "versus", // m_szName
STEPS_TYPE_DANCE_SINGLE, // m_StepsType StepsType_dance_single, // m_StepsType
StyleType_TwoPlayersTwoSides, // m_StyleType StyleType_TwoPlayersTwoSides, // m_StyleType
4, // m_iColsPerPlayer 4, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -183,7 +183,7 @@ static const Style g_Style_Dance_Double =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"double", // m_szName "double", // m_szName
STEPS_TYPE_DANCE_DOUBLE, // m_StepsType StepsType_dance_double, // m_StepsType
StyleType_OnePlayerTwoSides, // m_StyleType StyleType_OnePlayerTwoSides, // m_StyleType
8, // m_iColsPerPlayer 8, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -227,7 +227,7 @@ static const Style g_Style_Dance_Couple =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"couple", // m_szName "couple", // m_szName
STEPS_TYPE_DANCE_COUPLE, // m_StepsType StepsType_dance_couple, // m_StepsType
StyleType_TwoPlayersTwoSides, // m_StyleType StyleType_TwoPlayersTwoSides, // m_StyleType
4, // m_iColsPerPlayer 4, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -263,7 +263,7 @@ static const Style g_Style_Dance_Solo =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"solo", // m_szName "solo", // m_szName
STEPS_TYPE_DANCE_SOLO, // m_StepsType StepsType_dance_solo, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
6, // m_iColsPerPlayer 6, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -303,7 +303,7 @@ static const Style g_Style_Dance_Couple_Edit =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"couple-edit", // m_szName "couple-edit", // m_szName
STEPS_TYPE_DANCE_COUPLE, // m_StepsType StepsType_dance_couple, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
8, // m_iColsPerPlayer 8, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -344,7 +344,7 @@ static const Style g_Style_Dance_Couple_Edit =
static const Style g_Style_Dance_Solo_Versus = static const Style g_Style_Dance_Solo_Versus =
{ // STYLE_DANCE_SOLO_VERSUS { // STYLE_DANCE_SOLO_VERSUS
"dance-solo-versus", // m_szName "dance-solo-versus", // m_szName
STEPS_TYPE_DANCE_SOLO, // m_StepsType StepsType_dance_solo, // m_StepsType
ONE_PLAYER_ONE_CREDIT, // m_StyleType ONE_PLAYER_ONE_CREDIT, // m_StyleType
6, // m_iColsPerPlayer 6, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -384,7 +384,7 @@ static const Style g_Style_Dance_Routine =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"routine", // m_szName "routine", // m_szName
STEPS_TYPE_DANCE_ROUTINE, // m_StepsType StepsType_dance_routine, // m_StepsType
StyleType_TwoPlayersSharedSides, // m_StyleType StyleType_TwoPlayersSharedSides, // m_StyleType
8, // m_iColsPerPlayer 8, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -499,7 +499,7 @@ static const Style g_Style_Pump_Single =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay true, // m_bUsedForHowToPlay
"single", // m_szName "single", // m_szName
STEPS_TYPE_PUMP_SINGLE, // m_StepsType StepsType_pump_single, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
5, // m_iColsPerPlayer 5, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -537,7 +537,7 @@ static const Style g_Style_Pump_Versus =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"versus", // m_szName "versus", // m_szName
STEPS_TYPE_PUMP_SINGLE, // m_StepsType StepsType_pump_single, // m_StepsType
StyleType_TwoPlayersTwoSides, // m_StyleType StyleType_TwoPlayersTwoSides, // m_StyleType
5, // m_iColsPerPlayer 5, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -575,7 +575,7 @@ static const Style g_Style_Pump_HalfDouble =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"halfdouble", // m_szName "halfdouble", // m_szName
STEPS_TYPE_PUMP_HALFDOUBLE, // m_StepsType StepsType_pump_halfdouble, // m_StepsType
StyleType_OnePlayerTwoSides, // m_StyleType StyleType_OnePlayerTwoSides, // m_StyleType
6, // m_iColsPerPlayer 6, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -615,7 +615,7 @@ static const Style g_Style_Pump_Double =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"double", // m_szName "double", // m_szName
STEPS_TYPE_PUMP_DOUBLE, // m_StepsType StepsType_pump_double, // m_StepsType
StyleType_OnePlayerTwoSides, // m_StyleType StyleType_OnePlayerTwoSides, // m_StyleType
10, // m_iColsPerPlayer 10, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -663,7 +663,7 @@ static const Style g_Style_Pump_Couple =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"couple", // m_szName "couple", // m_szName
STEPS_TYPE_PUMP_COUPLE, // m_StepsType StepsType_pump_couple, // m_StepsType
StyleType_TwoPlayersTwoSides, // m_StyleType StyleType_TwoPlayersTwoSides, // m_StyleType
5, // m_iColsPerPlayer 5, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -701,7 +701,7 @@ static const Style g_Style_Pump_Couple_Edit =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"couple-edit", // m_szName "couple-edit", // m_szName
STEPS_TYPE_PUMP_COUPLE, // m_StepsType StepsType_pump_couple, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
10, // m_iColsPerPlayer 10, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -808,7 +808,7 @@ static const Style g_Style_KB7_Single =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay true, // m_bUsedForHowToPlay
"single", // m_szName "single", // m_szName
STEPS_TYPE_KB7_SINGLE, // m_StepsType StepsType_kb7_single, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
7, // m_iColsPerPlayer 7, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -850,7 +850,7 @@ static const Style g_Style_KB7_Versus =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"versus", // m_szName "versus", // m_szName
STEPS_TYPE_KB7_SINGLE, // m_StepsType StepsType_kb7_single, // m_StepsType
StyleType_TwoPlayersTwoSides, // m_StyleType StyleType_TwoPlayersTwoSides, // m_StyleType
7, // m_iColsPerPlayer 7, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -937,7 +937,7 @@ static const Style g_Style_Ez2_Single =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay true, // m_bUsedForHowToPlay
"single", // m_szName "single", // m_szName
STEPS_TYPE_EZ2_SINGLE, // m_StepsType StepsType_ez2_single, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
5, // m_iColsPerPlayer 5, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -975,7 +975,7 @@ static const Style g_Style_Ez2_Real =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"real", // m_szName "real", // m_szName
STEPS_TYPE_EZ2_REAL, // m_StepsType StepsType_ez2_real, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
7, // m_iColsPerPlayer 7, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1017,7 +1017,7 @@ static const Style g_Style_Ez2_Single_Versus =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"versus", // m_szName "versus", // m_szName
STEPS_TYPE_EZ2_SINGLE, // m_StepsType StepsType_ez2_single, // m_StepsType
StyleType_TwoPlayersTwoSides, // m_StyleType StyleType_TwoPlayersTwoSides, // m_StyleType
5, // m_iColsPerPlayer 5, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1055,7 +1055,7 @@ static const Style g_Style_Ez2_Real_Versus =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"versusReal", // m_szName "versusReal", // m_szName
STEPS_TYPE_EZ2_REAL, // m_StepsType StepsType_ez2_real, // m_StepsType
StyleType_TwoPlayersTwoSides, // m_StyleType StyleType_TwoPlayersTwoSides, // m_StyleType
7, // m_iColsPerPlayer 7, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1097,7 +1097,7 @@ static const Style g_Style_Ez2_Real_Double =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"double", // m_szName "double", // m_szName
STEPS_TYPE_EZ2_DOUBLE, // m_StepsType StepsType_ez2_double, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
10, // m_iColsPerPlayer 10, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1204,7 +1204,7 @@ static const Style g_Style_Para_Single =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay true, // m_bUsedForHowToPlay
"single", // m_szName "single", // m_szName
STEPS_TYPE_PARA_SINGLE, // m_StepsType StepsType_para_single, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
5, // m_iColsPerPlayer 5, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1242,7 +1242,7 @@ static const Style g_Style_Para_Versus =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay true, // m_bUsedForHowToPlay
"versus", // m_szName "versus", // m_szName
STEPS_TYPE_PARA_SINGLE, // m_StepsType StepsType_para_single, // m_StepsType
StyleType_TwoPlayersTwoSides, // m_StyleType StyleType_TwoPlayersTwoSides, // m_StyleType
5, // m_iColsPerPlayer 5, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1331,7 +1331,7 @@ static const Style g_Style_DS3DDX_Single =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay true, // m_bUsedForHowToPlay
"single", // m_szName "single", // m_szName
STEPS_TYPE_DS3DDX_SINGLE, // m_StepsType StepsType_ds3ddx_single, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
8, // m_iColsPerPlayer 8, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1434,7 +1434,7 @@ static const Style g_Style_Beat_Single5 =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay true, // m_bUsedForHowToPlay
"single5", // m_szName "single5", // m_szName
STEPS_TYPE_BEAT_SINGLE5, // m_StepsType StepsType_beat_single5, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
6, // m_iColsPerPlayer 6, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1474,7 +1474,7 @@ static const Style g_Style_Beat_Double =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"double5", // m_szName "double5", // m_szName
STEPS_TYPE_BEAT_DOUBLE5, // m_StepsType StepsType_beat_double5, // m_StepsType
StyleType_OnePlayerTwoSides, // m_StyleType StyleType_OnePlayerTwoSides, // m_StyleType
12, // m_iColsPerPlayer 12, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1526,7 +1526,7 @@ static const Style g_Style_Beat_Single7 =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"single7", // m_szName "single7", // m_szName
STEPS_TYPE_BEAT_SINGLE7, // m_StepsType StepsType_beat_single7, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
8, // m_iColsPerPlayer 8, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1570,7 +1570,7 @@ static const Style g_Style_Beat_Double7 =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"double7", // m_szName "double7", // m_szName
STEPS_TYPE_BEAT_DOUBLE7, // m_StepsType StepsType_beat_double7, // m_StepsType
StyleType_OnePlayerTwoSides, // m_StyleType StyleType_OnePlayerTwoSides, // m_StyleType
16, // m_iColsPerPlayer 16, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1694,7 +1694,7 @@ static const Style g_Style_Maniax_Single =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay true, // m_bUsedForHowToPlay
"single", // m_szName "single", // m_szName
STEPS_TYPE_MANIAX_SINGLE, // m_StepsType StepsType_maniax_single, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
4, // m_iColsPerPlayer 4, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1730,7 +1730,7 @@ static const Style g_Style_Maniax_Versus =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"versus", // m_szName "versus", // m_szName
STEPS_TYPE_MANIAX_SINGLE, // m_StepsType StepsType_maniax_single, // m_StepsType
StyleType_TwoPlayersTwoSides, // m_StyleType StyleType_TwoPlayersTwoSides, // m_StyleType
4, // m_iColsPerPlayer 4, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1766,7 +1766,7 @@ static const Style g_Style_Maniax_Double =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"double", // m_szName "double", // m_szName
STEPS_TYPE_MANIAX_DOUBLE, // m_StepsType StepsType_maniax_double, // m_StepsType
StyleType_OnePlayerTwoSides, // m_StyleType StyleType_OnePlayerTwoSides, // m_StyleType
8, // m_iColsPerPlayer 8, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1864,7 +1864,7 @@ static const Style g_Style_Techno_Single4 =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"single4", // m_szName "single4", // m_szName
STEPS_TYPE_TECHNO_SINGLE4, // m_StepsType StepsType_techno_single4, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
4, // m_iColsPerPlayer 4, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1900,7 +1900,7 @@ static const Style g_Style_Techno_Single5 =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"single5", // m_szName "single5", // m_szName
STEPS_TYPE_TECHNO_SINGLE5, // m_StepsType StepsType_techno_single5, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
5, // m_iColsPerPlayer 5, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1940,7 +1940,7 @@ static const Style g_Style_Techno_Single8 =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay true, // m_bUsedForHowToPlay
"single8", // m_szName "single8", // m_szName
STEPS_TYPE_TECHNO_SINGLE8, // m_StepsType StepsType_techno_single8, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
8, // m_iColsPerPlayer 8, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -1984,7 +1984,7 @@ static const Style g_Style_Techno_Versus4 =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"versus4", // m_szName "versus4", // m_szName
STEPS_TYPE_TECHNO_SINGLE4, // m_StepsType StepsType_techno_single4, // m_StepsType
StyleType_TwoPlayersTwoSides, // m_StyleType StyleType_TwoPlayersTwoSides, // m_StyleType
4, // m_iColsPerPlayer 4, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -2020,7 +2020,7 @@ static const Style g_Style_Techno_Versus5 =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"versus5", // m_szName "versus5", // m_szName
STEPS_TYPE_TECHNO_SINGLE5, // m_StepsType StepsType_techno_single5, // m_StepsType
StyleType_TwoPlayersTwoSides, // m_StyleType StyleType_TwoPlayersTwoSides, // m_StyleType
5, // m_iColsPerPlayer 5, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -2060,7 +2060,7 @@ static const Style g_Style_Techno_Versus8 =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"versus8", // m_szName "versus8", // m_szName
STEPS_TYPE_TECHNO_SINGLE8, // m_StepsType StepsType_techno_single8, // m_StepsType
StyleType_TwoPlayersTwoSides, // m_StyleType StyleType_TwoPlayersTwoSides, // m_StyleType
8, // m_iColsPerPlayer 8, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -2106,7 +2106,7 @@ static const Style g_Style_Techno_Double4 =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"double4", // m_szName "double4", // m_szName
STEPS_TYPE_TECHNO_DOUBLE4, // m_StepsType StepsType_techno_double4, // m_StepsType
StyleType_OnePlayerTwoSides, // m_StyleType StyleType_OnePlayerTwoSides, // m_StyleType
8, // m_iColsPerPlayer 8, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -2150,7 +2150,7 @@ static const Style g_Style_Techno_Double5 =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"double5", // m_szName "double5", // m_szName
STEPS_TYPE_TECHNO_DOUBLE5, // m_StepsType StepsType_techno_double5, // m_StepsType
StyleType_OnePlayerTwoSides, // m_StyleType StyleType_OnePlayerTwoSides, // m_StyleType
10, // m_iColsPerPlayer 10, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -2279,7 +2279,7 @@ static const Style g_Style_Popn_Five =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"popn-five", // m_szName "popn-five", // m_szName
STEPS_TYPE_POPN_FIVE, // m_StepsType StepsType_popn_five, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
5, // m_iColsPerPlayer 5, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -2317,7 +2317,7 @@ static const Style g_Style_Popn_Nine =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay true, // m_bUsedForHowToPlay
"popn-nine", // m_szName "popn-nine", // m_szName
STEPS_TYPE_POPN_NINE, // m_StepsType StepsType_popn_nine, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
9, // m_iColsPerPlayer 9, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -2425,7 +2425,7 @@ static const Style g_Style_Karaoke_Single =
true, // m_bUsedForDemonstration true, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay true, // m_bUsedForHowToPlay
"single", // m_szName "single", // m_szName
STEPS_TYPE_KARAOKE_SINGLE, // m_StepsType StepsType_karaoke_single, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
1, // m_iColsPerPlayer 1, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
@@ -2506,7 +2506,7 @@ static const Style g_Style_Lights_Cabinet =
false, // m_bUsedForDemonstration false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay false, // m_bUsedForHowToPlay
"cabinet", // m_szName "cabinet", // m_szName
STEPS_TYPE_LIGHTS_CABINET, // m_StepsType StepsType_lights_cabinet, // m_StepsType
StyleType_OnePlayerOneSide, // m_StyleType StyleType_OnePlayerOneSide, // m_StyleType
NUM_CabinetLight, // m_iColsPerPlayer NUM_CabinetLight, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
stepmania/src/GameSoundManager.cpp
+1 -1
View File
@@ -146,7 +146,7 @@ static void StartMusic( MusicToPlay &ToPlay )
ToPlay.HasTiming = true; ToPlay.HasTiming = true;
ToPlay.m_TimingData = song.m_Timing; ToPlay.m_TimingData = song.m_Timing;
// get cabinet lights if any // get cabinet lights if any
Steps *pStepsCabinetLights = SongUtil::GetOneSteps( &song, STEPS_TYPE_LIGHTS_CABINET ); Steps *pStepsCabinetLights = SongUtil::GetOneSteps( &song, StepsType_lights_cabinet );
if( pStepsCabinetLights ) if( pStepsCabinetLights )
pStepsCabinetLights->GetNoteData( ToPlay.m_LightsData ); pStepsCabinetLights->GetNoteData( ToPlay.m_LightsData );
} }
stepmania/src/NoteDataUtil.cpp
+18 -18
View File
@@ -657,7 +657,7 @@ void NoteDataUtil::LoadTransformedLights( const NoteData &in, NoteData &out, int
LightTransformHelper( in, out, aiTracks ); LightTransformHelper( in, out, aiTracks );
} }
/* This transform is specific to STEPS_TYPE_LIGHTS_CABINET. */ /* This transform is specific to StepsType_lights_cabinet. */
#include "LightsManager.h" // for LIGHT_* #include "LightsManager.h" // for LIGHT_*
void NoteDataUtil::LoadTransformedLightsFromTwo( const NoteData &marquee, const NoteData &bass, NoteData &out ) void NoteDataUtil::LoadTransformedLightsFromTwo( const NoteData &marquee, const NoteData &bass, NoteData &out )
{ {
@@ -985,10 +985,10 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu
// Is there a way to do this without handling each StepsType? -Chris // Is there a way to do this without handling each StepsType? -Chris
switch( st ) switch( st )
{ {
case STEPS_TYPE_DANCE_SINGLE: case StepsType_dance_single:
case STEPS_TYPE_DANCE_DOUBLE: case StepsType_dance_double:
case STEPS_TYPE_DANCE_COUPLE: case StepsType_dance_couple:
case STEPS_TYPE_DANCE_ROUTINE: case StepsType_dance_routine:
iTakeFromTrack[0] = 2; iTakeFromTrack[0] = 2;
iTakeFromTrack[1] = 0; iTakeFromTrack[1] = 0;
iTakeFromTrack[2] = 3; iTakeFromTrack[2] = 3;
@@ -998,7 +998,7 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu
iTakeFromTrack[6] = 7; iTakeFromTrack[6] = 7;
iTakeFromTrack[7] = 5; iTakeFromTrack[7] = 5;
break; break;
case STEPS_TYPE_DANCE_SOLO: case StepsType_dance_solo:
iTakeFromTrack[0] = 5; iTakeFromTrack[0] = 5;
iTakeFromTrack[1] = 4; iTakeFromTrack[1] = 4;
iTakeFromTrack[2] = 0; iTakeFromTrack[2] = 0;
@@ -1006,8 +1006,8 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu
iTakeFromTrack[4] = 1; iTakeFromTrack[4] = 1;
iTakeFromTrack[5] = 2; iTakeFromTrack[5] = 2;
break; break;
case STEPS_TYPE_PUMP_SINGLE: case StepsType_pump_single:
case STEPS_TYPE_PUMP_COUPLE: case StepsType_pump_couple:
iTakeFromTrack[0] = 3; iTakeFromTrack[0] = 3;
iTakeFromTrack[1] = 4; iTakeFromTrack[1] = 4;
iTakeFromTrack[2] = 2; iTakeFromTrack[2] = 2;
@@ -1019,7 +1019,7 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu
iTakeFromTrack[8] = 5; iTakeFromTrack[8] = 5;
iTakeFromTrack[9] = 6; iTakeFromTrack[9] = 6;
break; break;
case STEPS_TYPE_PUMP_HALFDOUBLE: case StepsType_pump_halfdouble:
iTakeFromTrack[0] = 2; iTakeFromTrack[0] = 2;
iTakeFromTrack[1] = 0; iTakeFromTrack[1] = 0;
iTakeFromTrack[2] = 1; iTakeFromTrack[2] = 1;
@@ -1027,7 +1027,7 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu
iTakeFromTrack[4] = 4; iTakeFromTrack[4] = 4;
iTakeFromTrack[5] = 5; iTakeFromTrack[5] = 5;
break; break;
case STEPS_TYPE_PUMP_DOUBLE: case StepsType_pump_double:
iTakeFromTrack[0] = 8; iTakeFromTrack[0] = 8;
iTakeFromTrack[1] = 9; iTakeFromTrack[1] = 9;
iTakeFromTrack[2] = 7; iTakeFromTrack[2] = 7;
@@ -1079,8 +1079,8 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu
case NoteDataUtil::stomp: case NoteDataUtil::stomp:
switch( st ) switch( st )
{ {
case STEPS_TYPE_DANCE_SINGLE: case StepsType_dance_single:
case STEPS_TYPE_DANCE_COUPLE: case StepsType_dance_couple:
iTakeFromTrack[0] = 3; iTakeFromTrack[0] = 3;
iTakeFromTrack[1] = 2; iTakeFromTrack[1] = 2;
iTakeFromTrack[2] = 1; iTakeFromTrack[2] = 1;
@@ -1090,8 +1090,8 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu
iTakeFromTrack[6] = 5; iTakeFromTrack[6] = 5;
iTakeFromTrack[7] = 4; iTakeFromTrack[7] = 4;
break; break;
case STEPS_TYPE_DANCE_DOUBLE: case StepsType_dance_double:
case STEPS_TYPE_DANCE_ROUTINE: case StepsType_dance_routine:
iTakeFromTrack[0] = 1; iTakeFromTrack[0] = 1;
iTakeFromTrack[1] = 0; iTakeFromTrack[1] = 0;
iTakeFromTrack[2] = 3; iTakeFromTrack[2] = 3;
@@ -1874,10 +1874,10 @@ struct ValidRow
#define f false #define f false
const ValidRow g_ValidRows[] = const ValidRow g_ValidRows[] =
{ {
{ STEPS_TYPE_DANCE_DOUBLE, { T,T,T,T,f,f,f,f } }, { StepsType_dance_double, { T,T,T,T,f,f,f,f } },
{ STEPS_TYPE_DANCE_DOUBLE, { f,T,T,T,T,f,f,f } }, { StepsType_dance_double, { f,T,T,T,T,f,f,f } },
{ STEPS_TYPE_DANCE_DOUBLE, { f,f,f,T,T,T,T,f } }, { StepsType_dance_double, { f,f,f,T,T,T,T,f } },
{ STEPS_TYPE_DANCE_DOUBLE, { f,f,f,f,T,T,T,T } }, { StepsType_dance_double, { f,f,f,f,T,T,T,T } },
}; };
#undef T #undef T
#undef f #undef f
stepmania/src/NotesLoaderBMS.cpp
+22 -22
View File
@@ -173,20 +173,20 @@ static StepsType DetermineStepsType( int iPlayer, const NoteData &nd, const RStr
* 9 - popn 9-key */ * 9 - popn 9-key */
switch( iNumNonEmptyTracks ) switch( iNumNonEmptyTracks )
{ {
case 4: return STEPS_TYPE_DANCE_SINGLE; case 4: return StepsType_dance_single;
case 5: return STEPS_TYPE_POPN_FIVE; case 5: return StepsType_popn_five;
case 6: case 6:
// FIXME: There's no way to distinguish between these types. // FIXME: There's no way to distinguish between these types.
// They use the same tracks. Assume it's a Beat type since they // They use the same tracks. Assume it's a Beat type since they
// are more common. // are more common.
//return STEPS_TYPE_DANCE_SOLO; //return StepsType_dance_solo;
return STEPS_TYPE_BEAT_SINGLE5; return StepsType_beat_single5;
case 8: return STEPS_TYPE_BEAT_SINGLE7; case 8: return StepsType_beat_single7;
case 9: return STEPS_TYPE_POPN_NINE; case 9: return StepsType_popn_nine;
default: return StepsType_Invalid; default: return StepsType_Invalid;
} }
case 2: // couple/battle case 2: // couple/battle
return STEPS_TYPE_DANCE_COUPLE; return StepsType_dance_couple;
case 3: // double case 3: // double
/* Track counts: /* Track counts:
* 8 - dance Double * 8 - dance Double
@@ -194,9 +194,9 @@ static StepsType DetermineStepsType( int iPlayer, const NoteData &nd, const RStr
* 16 - beat Double 7-key */ * 16 - beat Double 7-key */
switch( iNumNonEmptyTracks ) switch( iNumNonEmptyTracks )
{ {
case 8: return STEPS_TYPE_BEAT_SINGLE7; case 8: return StepsType_beat_single7;
case 12: return STEPS_TYPE_BEAT_DOUBLE5; case 12: return StepsType_beat_double5;
case 16: return STEPS_TYPE_BEAT_DOUBLE7; case 16: return StepsType_beat_double7;
default: return StepsType_Invalid; default: return StepsType_Invalid;
} }
default: default:
@@ -573,7 +573,7 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo
} }
out.m_StepsType = DetermineStepsType( iPlayer, ndNotes, sPath ); out.m_StepsType = DetermineStepsType( iPlayer, ndNotes, sPath );
if( out.m_StepsType == STEPS_TYPE_BEAT_SINGLE5 && GetTagFromMap( mapNameToData, "#title", sData ) ) if( out.m_StepsType == StepsType_beat_single5 && GetTagFromMap( mapNameToData, "#title", sData ) )
{ {
/* Hack: guess at 6-panel. */ /* Hack: guess at 6-panel. */
@@ -583,7 +583,7 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo
// if there's a 6 in the description, it's probably part of "6panel" or "6-panel" // if there's a 6 in the description, it's probably part of "6panel" or "6-panel"
if( sData.find('6', iOpenBracket) < iCloseBracket ) if( sData.find('6', iOpenBracket) < iCloseBracket )
out.m_StepsType = STEPS_TYPE_DANCE_SOLO; out.m_StepsType = StepsType_dance_solo;
} }
if( out.m_StepsType == StepsType_Invalid ) if( out.m_StepsType == StepsType_Invalid )
@@ -619,14 +619,14 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo
switch( out.m_StepsType ) switch( out.m_StepsType )
{ {
case STEPS_TYPE_DANCE_SINGLE: case StepsType_dance_single:
iTransformNewToOld[0] = BMS_P1_KEY1; iTransformNewToOld[0] = BMS_P1_KEY1;
iTransformNewToOld[1] = BMS_P1_KEY3; iTransformNewToOld[1] = BMS_P1_KEY3;
iTransformNewToOld[2] = BMS_P1_KEY5; iTransformNewToOld[2] = BMS_P1_KEY5;
iTransformNewToOld[3] = BMS_P1_TURN; iTransformNewToOld[3] = BMS_P1_TURN;
break; break;
case STEPS_TYPE_DANCE_DOUBLE: case StepsType_dance_double:
case STEPS_TYPE_DANCE_COUPLE: case StepsType_dance_couple:
iTransformNewToOld[0] = BMS_P1_KEY1; iTransformNewToOld[0] = BMS_P1_KEY1;
iTransformNewToOld[1] = BMS_P1_KEY3; iTransformNewToOld[1] = BMS_P1_KEY3;
iTransformNewToOld[2] = BMS_P1_KEY5; iTransformNewToOld[2] = BMS_P1_KEY5;
@@ -636,8 +636,8 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo
iTransformNewToOld[6] = BMS_P2_KEY5; iTransformNewToOld[6] = BMS_P2_KEY5;
iTransformNewToOld[7] = BMS_P2_TURN; iTransformNewToOld[7] = BMS_P2_TURN;
break; break;
case STEPS_TYPE_DANCE_SOLO: case StepsType_dance_solo:
case STEPS_TYPE_BEAT_SINGLE5: case StepsType_beat_single5:
// Hey! Why are these exactly the same? :-) // Hey! Why are these exactly the same? :-)
iTransformNewToOld[0] = BMS_P1_KEY1; iTransformNewToOld[0] = BMS_P1_KEY1;
iTransformNewToOld[1] = BMS_P1_KEY2; iTransformNewToOld[1] = BMS_P1_KEY2;
@@ -646,7 +646,7 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo
iTransformNewToOld[4] = BMS_P1_KEY5; iTransformNewToOld[4] = BMS_P1_KEY5;
iTransformNewToOld[5] = BMS_P1_TURN; iTransformNewToOld[5] = BMS_P1_TURN;
break; break;
case STEPS_TYPE_POPN_FIVE: case StepsType_popn_five:
iTransformNewToOld[0] = BMS_P1_KEY3; iTransformNewToOld[0] = BMS_P1_KEY3;
iTransformNewToOld[1] = BMS_P1_KEY4; iTransformNewToOld[1] = BMS_P1_KEY4;
iTransformNewToOld[2] = BMS_P1_KEY5; iTransformNewToOld[2] = BMS_P1_KEY5;
@@ -654,7 +654,7 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo
iTransformNewToOld[3] = BMS_P2_KEY2; iTransformNewToOld[3] = BMS_P2_KEY2;
iTransformNewToOld[4] = BMS_P2_KEY3; iTransformNewToOld[4] = BMS_P2_KEY3;
break; break;
case STEPS_TYPE_POPN_NINE: case StepsType_popn_nine:
iTransformNewToOld[0] = BMS_P1_KEY1; // lwhite iTransformNewToOld[0] = BMS_P1_KEY1; // lwhite
iTransformNewToOld[1] = BMS_P1_KEY2; // lyellow iTransformNewToOld[1] = BMS_P1_KEY2; // lyellow
iTransformNewToOld[2] = BMS_P1_KEY3; // lgreen iTransformNewToOld[2] = BMS_P1_KEY3; // lgreen
@@ -666,7 +666,7 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo
iTransformNewToOld[7] = BMS_P2_KEY4; // ryellow iTransformNewToOld[7] = BMS_P2_KEY4; // ryellow
iTransformNewToOld[8] = BMS_P2_KEY5; // rwhite iTransformNewToOld[8] = BMS_P2_KEY5; // rwhite
break; break;
case STEPS_TYPE_BEAT_DOUBLE5: case StepsType_beat_double5:
iTransformNewToOld[0] = BMS_P1_KEY1; iTransformNewToOld[0] = BMS_P1_KEY1;
iTransformNewToOld[1] = BMS_P1_KEY2; iTransformNewToOld[1] = BMS_P1_KEY2;
iTransformNewToOld[2] = BMS_P1_KEY3; iTransformNewToOld[2] = BMS_P1_KEY3;
@@ -680,7 +680,7 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo
iTransformNewToOld[10] = BMS_P2_KEY5; iTransformNewToOld[10] = BMS_P2_KEY5;
iTransformNewToOld[11] = BMS_P2_TURN; iTransformNewToOld[11] = BMS_P2_TURN;
break; break;
case STEPS_TYPE_BEAT_SINGLE7: case StepsType_beat_single7:
iTransformNewToOld[0] = BMS_P1_KEY1; iTransformNewToOld[0] = BMS_P1_KEY1;
iTransformNewToOld[1] = BMS_P1_KEY2; iTransformNewToOld[1] = BMS_P1_KEY2;
iTransformNewToOld[2] = BMS_P1_KEY3; iTransformNewToOld[2] = BMS_P1_KEY3;
@@ -690,7 +690,7 @@ static bool LoadFromBMSFile( const RString &sPath, const NameToData_t &mapNameTo
iTransformNewToOld[6] = BMS_P1_KEY7; iTransformNewToOld[6] = BMS_P1_KEY7;
iTransformNewToOld[7] = BMS_P1_TURN; iTransformNewToOld[7] = BMS_P1_TURN;
break; break;
case STEPS_TYPE_BEAT_DOUBLE7: case StepsType_beat_double7:
iTransformNewToOld[0] = BMS_P1_KEY1; iTransformNewToOld[0] = BMS_P1_KEY1;
iTransformNewToOld[1] = BMS_P1_KEY2; iTransformNewToOld[1] = BMS_P1_KEY2;
iTransformNewToOld[2] = BMS_P1_KEY3; iTransformNewToOld[2] = BMS_P1_KEY3;
stepmania/src/NotesLoaderDWI.cpp
+9 -9
View File
@@ -128,28 +128,28 @@ static bool LoadFromDWITokens(
out.m_StepsType = StepsType_Invalid; out.m_StepsType = StepsType_Invalid;
if( sMode == "SINGLE" ) out.m_StepsType = STEPS_TYPE_DANCE_SINGLE; if( sMode == "SINGLE" ) out.m_StepsType = StepsType_dance_single;
else if( sMode == "DOUBLE" ) out.m_StepsType = STEPS_TYPE_DANCE_DOUBLE; else if( sMode == "DOUBLE" ) out.m_StepsType = StepsType_dance_double;
else if( sMode == "COUPLE" ) out.m_StepsType = STEPS_TYPE_DANCE_COUPLE; else if( sMode == "COUPLE" ) out.m_StepsType = StepsType_dance_couple;
else if( sMode == "SOLO" ) out.m_StepsType = STEPS_TYPE_DANCE_SOLO; else if( sMode == "SOLO" ) out.m_StepsType = StepsType_dance_solo;
else else
{ {
ASSERT(0); // Unrecognized DWI notes format ASSERT(0); // Unrecognized DWI notes format
out.m_StepsType = STEPS_TYPE_DANCE_SINGLE; out.m_StepsType = StepsType_dance_single;
} }
g_mapDanceNoteToNoteDataColumn.clear(); g_mapDanceNoteToNoteDataColumn.clear();
switch( out.m_StepsType ) switch( out.m_StepsType )
{ {
case STEPS_TYPE_DANCE_SINGLE: case StepsType_dance_single:
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_LEFT] = 0; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_LEFT] = 0;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_DOWN] = 1; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_DOWN] = 1;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_UP] = 2; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_UP] = 2;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_RIGHT] = 3; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_RIGHT] = 3;
break; break;
case STEPS_TYPE_DANCE_DOUBLE: case StepsType_dance_double:
case STEPS_TYPE_DANCE_COUPLE: case StepsType_dance_couple:
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_LEFT] = 0; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_LEFT] = 0;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_DOWN] = 1; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_DOWN] = 1;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_UP] = 2; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_UP] = 2;
@@ -159,7 +159,7 @@ static bool LoadFromDWITokens(
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD2_UP] = 6; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD2_UP] = 6;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD2_RIGHT] = 7; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD2_RIGHT] = 7;
break; break;
case STEPS_TYPE_DANCE_SOLO: case StepsType_dance_solo:
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_LEFT] = 0; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_LEFT] = 0;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_UPLEFT] = 1; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_UPLEFT] = 1;
g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_DOWN] = 2; g_mapDanceNoteToNoteDataColumn[DANCE_NOTE_PAD1_DOWN] = 2;
stepmania/src/NotesLoaderKSF.cpp
+10 -10
View File
@@ -136,25 +136,25 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
if( !out.GetMeter() ) out.SetMeter( 8 ); if( !out.GetMeter() ) out.SetMeter( 8 );
} }
out.m_StepsType = STEPS_TYPE_PUMP_SINGLE; out.m_StepsType = StepsType_pump_single;
/* Check for "halfdouble" before "double". */ /* Check for "halfdouble" before "double". */
if( sFName.find("halfdouble") != string::npos || sFName.find("h_double") != string::npos ) if( sFName.find("halfdouble") != string::npos || sFName.find("h_double") != string::npos )
out.m_StepsType = STEPS_TYPE_PUMP_HALFDOUBLE; out.m_StepsType = StepsType_pump_halfdouble;
else if( sFName.find("double") != string::npos || sFName.find("nightmare") != string::npos ) else if( sFName.find("double") != string::npos || sFName.find("nightmare") != string::npos )
out.m_StepsType = STEPS_TYPE_PUMP_DOUBLE; out.m_StepsType = StepsType_pump_double;
else if( sFName.find("_1") != string::npos ) else if( sFName.find("_1") != string::npos )
out.m_StepsType = STEPS_TYPE_PUMP_SINGLE; out.m_StepsType = StepsType_pump_single;
else if( sFName.find("_2") != string::npos ) else if( sFName.find("_2") != string::npos )
out.m_StepsType = STEPS_TYPE_PUMP_COUPLE; out.m_StepsType = StepsType_pump_couple;
} }
switch( out.m_StepsType ) switch( out.m_StepsType )
{ {
case STEPS_TYPE_PUMP_SINGLE: notedata.SetNumTracks( 5 ); break; case StepsType_pump_single: notedata.SetNumTracks( 5 ); break;
case STEPS_TYPE_PUMP_COUPLE: notedata.SetNumTracks( 10 ); break; case StepsType_pump_couple: notedata.SetNumTracks( 10 ); break;
case STEPS_TYPE_PUMP_DOUBLE: notedata.SetNumTracks( 10 ); break; case StepsType_pump_double: notedata.SetNumTracks( 10 ); break;
case STEPS_TYPE_PUMP_HALFDOUBLE: notedata.SetNumTracks( 6 ); break; case StepsType_pump_halfdouble: notedata.SetNumTracks( 6 ); break;
default: FAIL_M( ssprintf("%i", out.m_StepsType) ); default: FAIL_M( ssprintf("%i", out.m_StepsType) );
} }
@@ -221,7 +221,7 @@ static bool LoadFromKSFFile( const RString &sPath, Steps &out, const Song &song,
} }
/* Half-doubles is offset; "0011111100000". */ /* Half-doubles is offset; "0011111100000". */
if( out.m_StepsType == STEPS_TYPE_PUMP_HALFDOUBLE ) if( out.m_StepsType == StepsType_pump_halfdouble )
sRowString.erase( 0, 2 ); sRowString.erase( 0, 2 );
// Update TICKCOUNT for Direct Move files. // Update TICKCOUNT for Direct Move files.
stepmania/src/NotesLoaderMidi.cpp
+1 -1
View File
@@ -875,7 +875,7 @@ skip_track:
} }
Steps *pSteps = new Steps; Steps *pSteps = new Steps;
pSteps->m_StepsType = STEPS_TYPE_GUITAR_FIVE; pSteps->m_StepsType = StepsType_guitar_five;
pSteps->SetDifficulty( (Difficulty)(gd+1) ); pSteps->SetDifficulty( (Difficulty)(gd+1) );
pSteps->SetNoteData( noteData ); pSteps->SetNoteData( noteData );
songOut.AddSteps( pSteps ); songOut.AddSteps( pSteps );
stepmania/src/NotesWriterDWI.cpp
+10 -10
View File
@@ -248,9 +248,9 @@ static void WriteDWINotesField( RageFile &f, const Steps &out, int start )
RString str; RString str;
switch( out.m_StepsType ) switch( out.m_StepsType )
{ {
case STEPS_TYPE_DANCE_SINGLE: case StepsType_dance_single:
case STEPS_TYPE_DANCE_COUPLE: case StepsType_dance_couple:
case STEPS_TYPE_DANCE_DOUBLE: case StepsType_dance_double:
str = NotesToDWIString( str = NotesToDWIString(
notedata.GetTapNote(start+0, row), notedata.GetTapNote(start+0, row),
notedata.GetTapNote(start+1, row), notedata.GetTapNote(start+1, row),
@@ -263,7 +263,7 @@ static void WriteDWINotesField( RageFile &f, const Steps &out, int start )
notedata.SetTapNote(start+2, row, TAP_EMPTY); notedata.SetTapNote(start+2, row, TAP_EMPTY);
notedata.SetTapNote(start+3, row, TAP_EMPTY); notedata.SetTapNote(start+3, row, TAP_EMPTY);
break; break;
case STEPS_TYPE_DANCE_SOLO: case StepsType_dance_solo:
str = NotesToDWIString( str = NotesToDWIString(
notedata.GetTapNote(0, row), notedata.GetTapNote(0, row),
notedata.GetTapNote(1, row), notedata.GetTapNote(1, row),
@@ -327,10 +327,10 @@ static bool WriteDWINotesTag( RageFile &f, const Steps &out )
switch( out.m_StepsType ) switch( out.m_StepsType )
{ {
case STEPS_TYPE_DANCE_SINGLE: f.Write( "#SINGLE:" ); break; case StepsType_dance_single: f.Write( "#SINGLE:" ); break;
case STEPS_TYPE_DANCE_COUPLE: f.Write( "#COUPLE:" ); break; case StepsType_dance_couple: f.Write( "#COUPLE:" ); break;
case STEPS_TYPE_DANCE_DOUBLE: f.Write( "#DOUBLE:" ); break; case StepsType_dance_double: f.Write( "#DOUBLE:" ); break;
case STEPS_TYPE_DANCE_SOLO: f.Write( "#SOLO:" ); break; case StepsType_dance_solo: f.Write( "#SOLO:" ); break;
default: return false; // not a type supported by DWI default: return false; // not a type supported by DWI
} }
@@ -423,8 +423,8 @@ bool NotesWriterDWI::Write( RString sPath, const Song &out )
continue; continue;
WriteDWINotesField( f, *pSteps, 0 ); WriteDWINotesField( f, *pSteps, 0 );
if( pSteps->m_StepsType==STEPS_TYPE_DANCE_DOUBLE || if( pSteps->m_StepsType==StepsType_dance_double ||
pSteps->m_StepsType==STEPS_TYPE_DANCE_COUPLE ) pSteps->m_StepsType==StepsType_dance_couple )
{ {
f.PutLine( ":" ); f.PutLine( ":" );
WriteDWINotesField( f, *pSteps, 4 ); WriteDWINotesField( f, *pSteps, 4 );
stepmania/src/NotesWriterSM.cpp
+1 -1
View File
@@ -296,7 +296,7 @@ RString NotesWriterSM::GetEditFileName( const Song *pSong, const Steps *pSteps )
RString sFile = pSong->GetTranslitFullTitle() + " - " + pSteps->GetDescription(); RString sFile = pSong->GetTranslitFullTitle() + " - " + pSteps->GetDescription();
// HACK: // HACK:
if( pSteps->m_StepsType == STEPS_TYPE_DANCE_DOUBLE ) if( pSteps->m_StepsType == StepsType_dance_double )
sFile += " (doubles)"; sFile += " (doubles)";
sFile += ".edit"; sFile += ".edit";
stepmania/src/ScreenEdit.cpp
+1 -1
View File
@@ -672,7 +672,7 @@ void ScreenEdit::Init()
CopyToLastSave(); CopyToLastSave();
m_CurrentAction = MAIN_MENU_CHOICE_INVALID; m_CurrentAction = MAIN_MENU_CHOICE_INVALID;
if( GAMESTATE->m_pCurSteps[0]->m_StepsType == STEPS_TYPE_DANCE_ROUTINE ) if( GAMESTATE->m_pCurSteps[0]->m_StepsType == StepsType_dance_routine )
m_InputPlayerNumber = PLAYER_1; m_InputPlayerNumber = PLAYER_1;
else else
m_InputPlayerNumber = PLAYER_INVALID; m_InputPlayerNumber = PLAYER_INVALID;
stepmania/src/ScreenGameplay.cpp
+2 -2
View File
@@ -1258,7 +1258,7 @@ void ScreenGameplay::LoadLights()
m_CabinetLightsNoteData.Init(); m_CabinetLightsNoteData.Init();
ASSERT( GAMESTATE->m_pCurSong ); ASSERT( GAMESTATE->m_pCurSong );
const Steps *pSteps = SongUtil::GetClosestNotes( GAMESTATE->m_pCurSong, STEPS_TYPE_LIGHTS_CABINET, Difficulty_Medium ); const Steps *pSteps = SongUtil::GetClosestNotes( GAMESTATE->m_pCurSong, StepsType_lights_cabinet, Difficulty_Medium );
if( pSteps != NULL ) if( pSteps != NULL )
{ {
pSteps->GetNoteData( m_CabinetLightsNoteData ); pSteps->GetNoteData( m_CabinetLightsNoteData );
@@ -1302,7 +1302,7 @@ void ScreenGameplay::LoadLights()
/* fall through */ /* fall through */
} }
NoteDataUtil::LoadTransformedLights( TapNoteData1, m_CabinetLightsNoteData, GameManager::GetStepsTypeInfo(STEPS_TYPE_LIGHTS_CABINET).iNumTracks ); NoteDataUtil::LoadTransformedLights( TapNoteData1, m_CabinetLightsNoteData, GameManager::GetStepsTypeInfo(StepsType_lights_cabinet).iNumTracks );
} }
void ScreenGameplay::StartPlayingSong( float fMinTimeToNotes, float fMinTimeToMusic ) void ScreenGameplay::StartPlayingSong( float fMinTimeToNotes, float fMinTimeToMusic )
stepmania/src/ScreenNetSelectMusic.cpp
+1 -1
View File
@@ -466,7 +466,7 @@ void ScreenNetSelectMusic::StartSelectedSong()
{ {
Song * pSong = m_MusicWheel.GetSelectedSong(); Song * pSong = m_MusicWheel.GetSelectedSong();
GAMESTATE->m_pCurSong.Set( pSong ); GAMESTATE->m_pCurSong.Set( pSong );
StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType; //STEPS_TYPE_DANCE_SINGLE; StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType; //StepsType_dance_single;
FOREACH_EnabledPlayer (pn) FOREACH_EnabledPlayer (pn)
{ {
GAMESTATE->m_PreferredDifficulty[pn].Set( m_DC[pn] ); GAMESTATE->m_PreferredDifficulty[pn].Set( m_DC[pn] );
stepmania/src/Song.cpp
+3 -3
View File
@@ -744,7 +744,7 @@ void Song::ReCalculateRadarValuesAndLastBeat()
// Don't set first/last beat based on lights. They often start very // Don't set first/last beat based on lights. They often start very
// early and end very late. // early and end very late.
if( pSteps->m_StepsType == STEPS_TYPE_LIGHTS_CABINET ) if( pSteps->m_StepsType == StepsType_lights_cabinet )
continue; continue;
NoteData tempNoteData; NoteData tempNoteData;
@@ -915,7 +915,7 @@ void Song::AddAutoGenNotes()
continue; continue;
/* If m_bAutogenSteps is disabled, only autogen lights. */ /* If m_bAutogenSteps is disabled, only autogen lights. */
if( !PREFSMAN->m_bAutogenSteps && stMissing != STEPS_TYPE_LIGHTS_CABINET ) if( !PREFSMAN->m_bAutogenSteps && stMissing != StepsType_lights_cabinet )
continue; continue;
if( !GameManager::GetStepsTypeInfo(stMissing).bAllowAutogen ) if( !GameManager::GetStepsTypeInfo(stMissing).bAllowAutogen )
continue; continue;
@@ -1015,7 +1015,7 @@ bool Song::IsTutorial() const
// A Song is a tutorial song is it has only Beginner steps. // A Song is a tutorial song is it has only Beginner steps.
FOREACH_CONST( Steps*, m_vpSteps, s ) FOREACH_CONST( Steps*, m_vpSteps, s )
{ {
if( (*s)->m_StepsType == STEPS_TYPE_LIGHTS_CABINET ) if( (*s)->m_StepsType == StepsType_lights_cabinet )
continue; // ignore continue; // ignore
if( (*s)->GetDifficulty() != Difficulty_Beginner ) if( (*s)->GetDifficulty() != Difficulty_Beginner )
return false; return false;
stepmania/src/Steps.cpp
+5 -5
View File
@@ -149,7 +149,7 @@ float Steps::PredictMeter() const
void Steps::TidyUpData() void Steps::TidyUpData()
{ {
if( m_StepsType == StepsType_Invalid ) if( m_StepsType == StepsType_Invalid )
m_StepsType = STEPS_TYPE_DANCE_SINGLE; m_StepsType = StepsType_dance_single;
if( GetDifficulty() == Difficulty_Invalid ) if( GetDifficulty() == Difficulty_Invalid )
SetDifficulty( StringToDifficulty(GetDescription()) ); SetDifficulty( StringToDifficulty(GetDescription()) );
@@ -216,7 +216,7 @@ void Steps::Decompress() const
int iNewTracks = GameManager::GetStepsTypeInfo(m_StepsType).iNumTracks; int iNewTracks = GameManager::GetStepsTypeInfo(m_StepsType).iNumTracks;
if( this->m_StepsType == STEPS_TYPE_LIGHTS_CABINET ) if( this->m_StepsType == StepsType_lights_cabinet )
{ {
NoteDataUtil::LoadTransformedLights( notedata, *m_pNoteData, iNewTracks ); NoteDataUtil::LoadTransformedLights( notedata, *m_pNoteData, iNewTracks );
} }
@@ -265,7 +265,7 @@ void Steps::Decompress() const
else else
{ {
// load from compressed // load from compressed
bool bComposite = m_StepsType == STEPS_TYPE_DANCE_ROUTINE; bool bComposite = m_StepsType == StepsType_dance_routine;
m_bNoteDataIsFilled = true; m_bNoteDataIsFilled = true;
m_pNoteData->SetNumTracks( GameManager::GetStepsTypeInfo(m_StepsType).iNumTracks ); m_pNoteData->SetNumTracks( GameManager::GetStepsTypeInfo(m_StepsType).iNumTracks );
@@ -276,14 +276,14 @@ void Steps::Decompress() const
void Steps::Compress() const void Steps::Compress() const
{ {
/* Always leave lights data uncompressed. */ /* Always leave lights data uncompressed. */
if( this->m_StepsType == STEPS_TYPE_LIGHTS_CABINET && m_bNoteDataIsFilled ) if( this->m_StepsType == StepsType_lights_cabinet && m_bNoteDataIsFilled )
{ {
m_sNoteDataCompressed = RString(); m_sNoteDataCompressed = RString();
return; return;
} }
/* Always leave karaoke data uncompressed. */ /* Always leave karaoke data uncompressed. */
if( this->m_StepsType == STEPS_TYPE_KARAOKE_SINGLE && m_bNoteDataIsFilled ) if( this->m_StepsType == StepsType_karaoke_single && m_bNoteDataIsFilled )
{ {
m_sNoteDataCompressed = RString(); m_sNoteDataCompressed = RString();
return; return;