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

merge bm with iidx

Browse Source 
eliminate duplicate styles and unnecesary edit styles
This commit is contained in:
Chris Danford
2004-09-25 17:41:31 +00:00
parent 83d1a6a504
commit 190b7c1493
4 changed files with 132 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameConstantsAndTypes.h
+5 -10
View File
@@ -53,16 +53,11 @@ enum StepsType
STEPS_TYPE_PARA_SINGLE,
STEPS_TYPE_PARA_VERSUS,
STEPS_TYPE_DS3DDX_SINGLE,
STEPS_TYPE_BM_SINGLE,
STEPS_TYPE_BM_DOUBLE,
STEPS_TYPE_IIDX_SINGLE7,
STEPS_TYPE_IIDX_DOUBLE7,
// These last two are probably going to be treated the same way
// as STEPS_TYPE_DANCE_COUPLE - autogenned for use, and then
// a duplicate "(edit)" entry for editing only.
STEPS_TYPE_IIDX_SINGLE5,
STEPS_TYPE_IIDX_DOUBLE5,
STEPS_TYPE_MANIAX_SINGLE,
STEPS_TYPE_BM_SINGLE5,
STEPS_TYPE_BM_DOUBLE5,
STEPS_TYPE_BM_SINGLE7,
STEPS_TYPE_BM_DOUBLE7,
STEPS_TYPE_MANIAX_SINGLE,
STEPS_TYPE_MANIAX_DOUBLE,
STEPS_TYPE_TECHNO_SINGLE4,
STEPS_TYPE_TECHNO_SINGLE5,
stepmania/src/GameInput.h
+2 -26
View File
@@ -115,8 +115,6 @@ enum // 3DDX Buttons
NUM_DS3DDX_BUTTONS, // leave this at the end.
};
/* TODO: Having two game types where the only difference is two keys is a waste.
* Delete BM and make the BM styles use only a subset of the IIDX keys. */
enum // BM Buttons
{
BM_BUTTON_KEY1,
@@ -124,6 +122,8 @@ enum // BM Buttons
BM_BUTTON_KEY3,
BM_BUTTON_KEY4,
BM_BUTTON_KEY5,
BM_BUTTON_KEY6,
BM_BUTTON_KEY7,
BM_BUTTON_SCRATCHUP,
/* XXX special case: this button is an alias of BM_BUTTON_SCRATCHUP for track
* matching. */
@@ -139,30 +139,6 @@ enum // BM Buttons
NUM_BM_BUTTONS, // leave this at the end.
};
enum // IIDX Buttons
{
IIDX_BUTTON_KEY1,
IIDX_BUTTON_KEY2,
IIDX_BUTTON_KEY3,
IIDX_BUTTON_KEY4,
IIDX_BUTTON_KEY5,
IIDX_BUTTON_KEY6,
IIDX_BUTTON_KEY7,
IIDX_BUTTON_SCRATCHUP,
/* XXX special case: this button is an alias of IIDX_BUTTON_SCRATCHUP for track
* matching. */
IIDX_BUTTON_SCRATCHDOWN,
IIDX_BUTTON_START,
IIDX_BUTTON_BACK,
IIDX_BUTTON_MENULEFT,
IIDX_BUTTON_MENURIGHT,
IIDX_BUTTON_MENUUP,
IIDX_BUTTON_MENUDOWN,
IIDX_BUTTON_COIN,
IIDX_BUTTON_OPERATOR,
NUM_IIDX_BUTTONS, // leave this at the end.
};
enum // ManiaxButtons
{
MANIAX_BUTTON_HANDUPLEFT,
stepmania/src/GameManager.cpp
+117 -413
View File
@@ -30,13 +30,11 @@ enum
TRACK_10,
TRACK_11,
TRACK_12,
TRACK_13, // BMS reader needs 13 tracks
// MD 10/26/03 - BMS reader needs a whole lot more than 13 tracks - more like 16
// because we have 11-16, 18, 19, 21-26, 28, 29 for IIDX double (bm-double7)
TRACK_13,
TRACK_14,
TRACK_15,
TRACK_16,
// MD 10/26/03 end
// BMS reader needs 16 tracks for bm-double7
};
enum
@@ -46,8 +44,7 @@ enum
GAME_EZ2, // Ez2dancer
GAME_PARA, // ParaPAraParadise
GAME_DS3DDX, // Dance Station 3DDX.
GAME_BM, // Beatmania
GAME_IIDX, // Beatmania IIDX
GAME_BM, // Beatmania IIDX
GAME_MANIAX, // DanceManiax
GAME_TECHNO, // TechnoMotion
GAME_PNM, // pop n music
@@ -64,7 +61,6 @@ const int EZ2_REAL_COL_SPACING = 40;
const int PARA_COL_SPACING = 54;
const int DS3DDX_COL_SPACING = 46;
const int BM_COL_SPACING = 34;
const int IIDX_COL_SPACING = 34;
const int MANIAX_COL_SPACING = 36;
const int TECHNO_COL_SPACING = 56;
const int TECHNO_VERSUS_COL_SPACING = 33;
@@ -89,12 +85,10 @@ struct {
{ "para-single", 5 },
{ "para-versus", 10 },
{ "ds3ddx-single", 8 },
{ "bm-single", 6 },
{ "bm-double", 12 },
{ "iidx-single7", 8 },
{ "iidx-double7", 16 },
{ "iidx-single5", 6 },
{ "iidx-double5", 12 },
{ "bm-single5", 6 },
{ "bm-double5", 12 },
{ "bm-single7", 8 },
{ "bm-double7", 16 },
{ "maniax-single", 4 },
{ "maniax-double", 8 },
{ "techno-single4", 4 },
@@ -603,111 +597,9 @@ Game g_Games[NUM_GAMES] =
},
{ // GAME_BM
"bm", // m_szName
"BeatMania", // m_szDescription
2, // m_iNumControllers
NUM_BM_BUTTONS, // m_iButtonsPerController
{ // m_szButtonNames
"Key1",
"Key2",
"Key3",
"Key4",
"Key5",
"Scratch up",
"Scratch down",
"Start",
"Back",
"MenuLeft",
"MenuRight",
"MenuUp",
"MenuDown",
"Insert Coin",
"Operator",
},
{ // m_szSecondaryFunction
"(MenuLeft)",
"",
"(MenuRight)",
"",
"",
"(MenuUp)",
"(MenuDown)",
"",
"",
"(dedicated)",
"(dedicated)",
"(dedicated)",
"(dedicated)",
"(dedicated)",
"",
"",
},
{ // m_DedicatedMenuButton
BM_BUTTON_MENULEFT, // MENU_BUTTON_LEFT
BM_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT
BM_BUTTON_MENUUP, // MENU_BUTTON_UP
BM_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN
BM_BUTTON_START, // MENU_BUTTON_START
BM_BUTTON_BACK, // MENU_BUTTON_BACK
BM_BUTTON_COIN, // MENU_BUTTON_COIN
BM_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR
},
{ // m_SecondaryMenuButton
BM_BUTTON_KEY1, // MENU_BUTTON_LEFT
BM_BUTTON_KEY3, // MENU_BUTTON_RIGHT
BM_BUTTON_SCRATCHUP, // MENU_BUTTON_UP
BM_BUTTON_SCRATCHDOWN, // MENU_BUTTON_DOWN
BM_BUTTON_START, // MENU_BUTTON_START
BM_BUTTON_BACK, // MENU_BUTTON_BACK
BM_BUTTON_COIN, // MENU_BUTTON_COIN
BM_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR
},
{ // m_iDefaultKeyboardKey
{ // PLAYER_1
KEY_Cm, // BM_BUTTON_KEY1,
KEY_Ck, // BM_BUTTON_KEY2,
KEY_COMMA, // BM_BUTTON_KEY3,
KEY_Cl, // BM_BUTTON_KEY4,
KEY_PERIOD, // BM_BUTTON_KEY5,
KEY_LSHIFT, // BM_BUTTON_SCRATCHUP,
NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHDOWN,
KEY_ENTER, // BM_BUTTON_START,
KEY_ESC, // BM_BUTTON_BACK,
KEY_LEFT, // BM_BUTTON_MENULEFT
KEY_RIGHT, // BM_BUTTON_MENURIGHT
KEY_UP, // BM_BUTTON_MENUUP
KEY_DOWN, // BM_BUTTON_MENUDOWN
KEY_F1, // BM_BUTTON_COIN
KEY_SCRLLOCK // BM_BUTTON_OPERATOR
},
{ // PLAYER_2
NO_DEFAULT_KEY, // BM_BUTTON_KEY1,
NO_DEFAULT_KEY, // BM_BUTTON_KEY2,
NO_DEFAULT_KEY, // BM_BUTTON_KEY3,
NO_DEFAULT_KEY, // BM_BUTTON_KEY4,
NO_DEFAULT_KEY, // BM_BUTTON_KEY5,
NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHUP,
NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHDOWN,
NO_DEFAULT_KEY, // BM_BUTTON_START,
NO_DEFAULT_KEY, // BM_BUTTON_BACK,
NO_DEFAULT_KEY, // BM_BUTTON_MENULEFT
NO_DEFAULT_KEY, // BM_BUTTON_MENURIGHT
NO_DEFAULT_KEY, // BM_BUTTON_MENUUP
NO_DEFAULT_KEY, // BM_BUTTON_MENUDOWN
NO_DEFAULT_KEY, // BM_BUTTON_COIN
NO_DEFAULT_KEY // BM_BUTTON_OPERATOR
},
},
TNS_MARVELOUS, // m_mapMarvelousTo
TNS_PERFECT, // m_mapPerfectTo
TNS_GREAT, // m_mapGreatTo
TNS_GOOD, // m_mapGoodTo
TNS_BOO, // m_mapBooTo
},
{ // GAME_IIDX
"iidx", // m_szName
"BeatMania IIDX", // m_szDescription
2, // m_iNumControllers
NUM_IIDX_BUTTONS, // m_iButtonsPerController
NUM_BM_BUTTONS, // m_iButtonsPerController
{ // m_szButtonNames
"Key1",
"Key2",
@@ -747,63 +639,63 @@ Game g_Games[NUM_GAMES] =
"",
},
{ // m_DedicatedMenuButton
IIDX_BUTTON_MENULEFT, // MENU_BUTTON_LEFT
IIDX_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT
IIDX_BUTTON_MENUUP, // MENU_BUTTON_UP
IIDX_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN
IIDX_BUTTON_START, // MENU_BUTTON_START
IIDX_BUTTON_BACK, // MENU_BUTTON_BACK
IIDX_BUTTON_COIN, // MENU_BUTTON_COIN
IIDX_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR
BM_BUTTON_MENULEFT, // MENU_BUTTON_LEFT
BM_BUTTON_MENURIGHT, // MENU_BUTTON_RIGHT
BM_BUTTON_MENUUP, // MENU_BUTTON_UP
BM_BUTTON_MENUDOWN, // MENU_BUTTON_DOWN
BM_BUTTON_START, // MENU_BUTTON_START
BM_BUTTON_BACK, // MENU_BUTTON_BACK
BM_BUTTON_COIN, // MENU_BUTTON_COIN
BM_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR
},
{ // m_SecondaryMenuButton
IIDX_BUTTON_KEY1, // MENU_BUTTON_LEFT
IIDX_BUTTON_KEY3, // MENU_BUTTON_RIGHT
IIDX_BUTTON_SCRATCHUP, // MENU_BUTTON_UP
IIDX_BUTTON_SCRATCHDOWN,// MENU_BUTTON_DOWN
IIDX_BUTTON_START, // MENU_BUTTON_START
IIDX_BUTTON_BACK, // MENU_BUTTON_BACK
IIDX_BUTTON_COIN, // MENU_BUTTON_COIN
IIDX_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR
BM_BUTTON_KEY1, // MENU_BUTTON_LEFT
BM_BUTTON_KEY3, // MENU_BUTTON_RIGHT
BM_BUTTON_SCRATCHUP, // MENU_BUTTON_UP
BM_BUTTON_SCRATCHDOWN,// MENU_BUTTON_DOWN
BM_BUTTON_START, // MENU_BUTTON_START
BM_BUTTON_BACK, // MENU_BUTTON_BACK
BM_BUTTON_COIN, // MENU_BUTTON_COIN
BM_BUTTON_OPERATOR, // MENU_BUTTON_OPERATOR
},
{ // m_iDefaultKeyboardKey
{ // PLAYER_1
KEY_Cm, // IIDX_BUTTON_KEY1,
KEY_Ck, // IIDX_BUTTON_KEY2,
KEY_COMMA, // IIDX_BUTTON_KEY3,
KEY_Cl, // IIDX_BUTTON_KEY4,
KEY_PERIOD, // IIDX_BUTTON_KEY5,
KEY_SEMICOLON, // IIDX_BUTTON_KEY6,
KEY_SLASH, // IIDX_BUTTON_KEY7,
KEY_LSHIFT, // IIDX_BUTTON_SCRATCHUP,
NO_DEFAULT_KEY, // IIDX_BUTTON_SCRATCHDOWN,
KEY_ENTER, // IIDX_BUTTON_START,
KEY_ESC, // IIDX_BUTTON_BACK,
KEY_LEFT, // IIDX_BUTTON_MENULEFT
KEY_RIGHT, // IIDX_BUTTON_MENURIGHT
KEY_UP, // IIDX_BUTTON_MENUUP
KEY_DOWN, // IIDX_BUTTON_MENUDOWN
KEY_F1, // IIDX_BUTTON_COIN
KEY_SCRLLOCK // IIDX_BUTTON_OPERATOR
KEY_Cm, // BM_BUTTON_KEY1,
KEY_Ck, // BM_BUTTON_KEY2,
KEY_COMMA, // BM_BUTTON_KEY3,
KEY_Cl, // BM_BUTTON_KEY4,
KEY_PERIOD, // BM_BUTTON_KEY5,
KEY_SEMICOLON, // BM_BUTTON_KEY6,
KEY_SLASH, // BM_BUTTON_KEY7,
KEY_LSHIFT, // BM_BUTTON_SCRATCHUP,
NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHDOWN,
KEY_ENTER, // BM_BUTTON_START,
KEY_ESC, // BM_BUTTON_BACK,
KEY_LEFT, // BM_BUTTON_MENULEFT
KEY_RIGHT, // BM_BUTTON_MENURIGHT
KEY_UP, // BM_BUTTON_MENUUP
KEY_DOWN, // BM_BUTTON_MENUDOWN
KEY_F1, // BM_BUTTON_COIN
KEY_SCRLLOCK // BM_BUTTON_OPERATOR
},
{ // PLAYER_2
NO_DEFAULT_KEY, // IIDX_BUTTON_KEY1,
NO_DEFAULT_KEY, // IIDX_BUTTON_KEY2,
NO_DEFAULT_KEY, // IIDX_BUTTON_KEY3,
NO_DEFAULT_KEY, // IIDX_BUTTON_KEY4,
NO_DEFAULT_KEY, // IIDX_BUTTON_KEY5,
NO_DEFAULT_KEY, // IIDX_BUTTON_KEY6,
NO_DEFAULT_KEY, // IIDX_BUTTON_KEY7,
NO_DEFAULT_KEY, // IIDX_BUTTON_SCRATCHUP,
NO_DEFAULT_KEY, // IIDX_BUTTON_SCRATCHDOWN,
NO_DEFAULT_KEY, // IIDX_BUTTON_START,
NO_DEFAULT_KEY, // IIDX_BUTTON_BACK,
NO_DEFAULT_KEY, // IIDX_BUTTON_MENULEFT
NO_DEFAULT_KEY, // IIDX_BUTTON_MENURIGHT
NO_DEFAULT_KEY, // IIDX_BUTTON_MENUUP
NO_DEFAULT_KEY, // IIDX_BUTTON_MENUDOWN
NO_DEFAULT_KEY, // IIDX_BUTTON_COIN
NO_DEFAULT_KEY // IIDX_BUTTON_OPERATOR
NO_DEFAULT_KEY, // BM_BUTTON_KEY1,
NO_DEFAULT_KEY, // BM_BUTTON_KEY2,
NO_DEFAULT_KEY, // BM_BUTTON_KEY3,
NO_DEFAULT_KEY, // BM_BUTTON_KEY4,
NO_DEFAULT_KEY, // BM_BUTTON_KEY5,
NO_DEFAULT_KEY, // BM_BUTTON_KEY6,
NO_DEFAULT_KEY, // BM_BUTTON_KEY7,
NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHUP,
NO_DEFAULT_KEY, // BM_BUTTON_SCRATCHDOWN,
NO_DEFAULT_KEY, // BM_BUTTON_START,
NO_DEFAULT_KEY, // BM_BUTTON_BACK,
NO_DEFAULT_KEY, // BM_BUTTON_MENULEFT
NO_DEFAULT_KEY, // BM_BUTTON_MENURIGHT
NO_DEFAULT_KEY, // BM_BUTTON_MENUUP
NO_DEFAULT_KEY, // BM_BUTTON_MENUDOWN
NO_DEFAULT_KEY, // BM_BUTTON_COIN
NO_DEFAULT_KEY // BM_BUTTON_OPERATOR
},
},
TNS_MARVELOUS, // m_mapMarvelousTo
@@ -1966,14 +1858,14 @@ Style g_Styles[] =
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
},
{ // STYLE_BM_SINGLE
{ // STYLE_BM_SINGLE5
&g_Games[GAME_BM], // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
true, // m_bUsedForDemonstration
true, // m_bUsedForHowToPlay
"single", // m_szName
STEPS_TYPE_BM_SINGLE, // m_StepsType
"single5", // m_szName
STEPS_TYPE_BM_SINGLE5, // m_StepsType
Style::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
6, // m_iColsPerPlayer
@@ -2007,8 +1899,8 @@ Style g_Styles[] =
true, // m_bUsedForEdit
false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay
"double", // m_szName
STEPS_TYPE_BM_DOUBLE, // m_StepsType
"double5", // m_szName
STEPS_TYPE_BM_DOUBLE5, // m_StepsType
Style::ONE_PLAYER_TWO_CREDITS, // m_StyleType
{ 320, 320 }, // m_iCenterX
12, // m_iColsPerPlayer
@@ -2048,37 +1940,37 @@ Style g_Styles[] =
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
},
{ // STYLE_IIDX_SINGLE7
&g_Games[GAME_IIDX], // m_Game
{ // STYLE_BM_SINGLE7
&g_Games[GAME_BM], // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay
"single7", // m_szName
STEPS_TYPE_IIDX_SINGLE7, // m_StepsType
STEPS_TYPE_BM_SINGLE7, // m_StepsType
Style::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
8, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1
{ TRACK_8, GAME_CONTROLLER_1, IIDX_BUTTON_SCRATCHUP, -IIDX_COL_SPACING*3.5f },
{ TRACK_1, GAME_CONTROLLER_1, IIDX_BUTTON_KEY1, -IIDX_COL_SPACING*2.0f },
{ TRACK_2, GAME_CONTROLLER_1, IIDX_BUTTON_KEY2, -IIDX_COL_SPACING*1.0f },
{ TRACK_3, GAME_CONTROLLER_1, IIDX_BUTTON_KEY3, -IIDX_COL_SPACING*0.0f },
{ TRACK_4, GAME_CONTROLLER_1, IIDX_BUTTON_KEY4, +IIDX_COL_SPACING*1.0f },
{ TRACK_5, GAME_CONTROLLER_1, IIDX_BUTTON_KEY5, +IIDX_COL_SPACING*2.0f },
{ TRACK_6, GAME_CONTROLLER_1, IIDX_BUTTON_KEY6, +IIDX_COL_SPACING*3.0f },
{ TRACK_7, GAME_CONTROLLER_1, IIDX_BUTTON_KEY7, +IIDX_COL_SPACING*4.0f },
{ TRACK_8, GAME_CONTROLLER_1, BM_BUTTON_SCRATCHUP, -BM_COL_SPACING*3.5f },
{ TRACK_1, GAME_CONTROLLER_1, BM_BUTTON_KEY1, -BM_COL_SPACING*2.0f },
{ TRACK_2, GAME_CONTROLLER_1, BM_BUTTON_KEY2, -BM_COL_SPACING*1.0f },
{ TRACK_3, GAME_CONTROLLER_1, BM_BUTTON_KEY3, -BM_COL_SPACING*0.0f },
{ TRACK_4, GAME_CONTROLLER_1, BM_BUTTON_KEY4, +BM_COL_SPACING*1.0f },
{ TRACK_5, GAME_CONTROLLER_1, BM_BUTTON_KEY5, +BM_COL_SPACING*2.0f },
{ TRACK_6, GAME_CONTROLLER_1, BM_BUTTON_KEY6, +BM_COL_SPACING*3.0f },
{ TRACK_7, GAME_CONTROLLER_1, BM_BUTTON_KEY7, +BM_COL_SPACING*4.0f },
},
{ // PLAYER_2
{ TRACK_1, GAME_CONTROLLER_2, IIDX_BUTTON_KEY1, -IIDX_COL_SPACING*3.5f },
{ TRACK_2, GAME_CONTROLLER_2, IIDX_BUTTON_KEY2, -IIDX_COL_SPACING*2.5f },
{ TRACK_3, GAME_CONTROLLER_2, IIDX_BUTTON_KEY3, -IIDX_COL_SPACING*1.5f },
{ TRACK_4, GAME_CONTROLLER_2, IIDX_BUTTON_KEY4, -IIDX_COL_SPACING*0.5f },
{ TRACK_5, GAME_CONTROLLER_2, IIDX_BUTTON_KEY5, +IIDX_COL_SPACING*0.5f },
{ TRACK_6, GAME_CONTROLLER_2, IIDX_BUTTON_KEY6, +IIDX_COL_SPACING*1.5f },
{ TRACK_7, GAME_CONTROLLER_2, IIDX_BUTTON_KEY7, +IIDX_COL_SPACING*2.5f },
{ TRACK_8, GAME_CONTROLLER_2, IIDX_BUTTON_SCRATCHUP, +IIDX_COL_SPACING*4.0f },
{ TRACK_1, GAME_CONTROLLER_2, BM_BUTTON_KEY1, -BM_COL_SPACING*3.5f },
{ TRACK_2, GAME_CONTROLLER_2, BM_BUTTON_KEY2, -BM_COL_SPACING*2.5f },
{ TRACK_3, GAME_CONTROLLER_2, BM_BUTTON_KEY3, -BM_COL_SPACING*1.5f },
{ TRACK_4, GAME_CONTROLLER_2, BM_BUTTON_KEY4, -BM_COL_SPACING*0.5f },
{ TRACK_5, GAME_CONTROLLER_2, BM_BUTTON_KEY5, +BM_COL_SPACING*0.5f },
{ TRACK_6, GAME_CONTROLLER_2, BM_BUTTON_KEY6, +BM_COL_SPACING*1.5f },
{ TRACK_7, GAME_CONTROLLER_2, BM_BUTTON_KEY7, +BM_COL_SPACING*2.5f },
{ TRACK_8, GAME_CONTROLLER_2, BM_BUTTON_SCRATCHUP, +BM_COL_SPACING*4.0f },
},
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
@@ -2087,241 +1979,53 @@ Style g_Styles[] =
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
},
{ // STYLE_IIDX_DOUBLE7
&g_Games[GAME_IIDX], // m_Game
{ // STYLE_BM_DOUBLE7
&g_Games[GAME_BM], // m_Game
true, // m_bUsedForGameplay
true, // m_bUsedForEdit
false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay
"double7", // m_szName
STEPS_TYPE_IIDX_DOUBLE7, // m_StepsType
STEPS_TYPE_BM_DOUBLE7, // m_StepsType
Style::ONE_PLAYER_TWO_CREDITS, // m_StyleType
{ 320, 320 }, // m_iCenterX
16, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1
{ TRACK_8, GAME_CONTROLLER_1, IIDX_BUTTON_SCRATCHUP, -IIDX_COL_SPACING*8.0f },
{ TRACK_1, GAME_CONTROLLER_1, IIDX_BUTTON_KEY1, -IIDX_COL_SPACING*6.5f },
{ TRACK_2, GAME_CONTROLLER_1, IIDX_BUTTON_KEY2, -IIDX_COL_SPACING*5.5f },
{ TRACK_3, GAME_CONTROLLER_1, IIDX_BUTTON_KEY3, -IIDX_COL_SPACING*4.5f },
{ TRACK_4, GAME_CONTROLLER_1, IIDX_BUTTON_KEY4, -IIDX_COL_SPACING*3.5f },
{ TRACK_5, GAME_CONTROLLER_1, IIDX_BUTTON_KEY5, -IIDX_COL_SPACING*2.5f },
{ TRACK_6, GAME_CONTROLLER_1, IIDX_BUTTON_KEY6, -IIDX_COL_SPACING*1.5f },
{ TRACK_7, GAME_CONTROLLER_1, IIDX_BUTTON_KEY7, -IIDX_COL_SPACING*0.5f },
{ TRACK_9, GAME_CONTROLLER_2, IIDX_BUTTON_KEY1, +IIDX_COL_SPACING*0.5f },
{ TRACK_10, GAME_CONTROLLER_2, IIDX_BUTTON_KEY2, +IIDX_COL_SPACING*1.5f },
{ TRACK_11, GAME_CONTROLLER_2, IIDX_BUTTON_KEY3, +IIDX_COL_SPACING*2.5f },
{ TRACK_12, GAME_CONTROLLER_2, IIDX_BUTTON_KEY4, +IIDX_COL_SPACING*3.5f },
{ TRACK_13, GAME_CONTROLLER_2, IIDX_BUTTON_KEY5, +IIDX_COL_SPACING*4.5f },
{ TRACK_14, GAME_CONTROLLER_2, IIDX_BUTTON_KEY6, +IIDX_COL_SPACING*5.5f },
{ TRACK_15, GAME_CONTROLLER_2, IIDX_BUTTON_KEY7, +IIDX_COL_SPACING*6.5f },
{ TRACK_16, GAME_CONTROLLER_2, IIDX_BUTTON_SCRATCHUP, +IIDX_COL_SPACING*8.0f },
{ TRACK_8, GAME_CONTROLLER_1, BM_BUTTON_SCRATCHUP, -BM_COL_SPACING*8.0f },
{ TRACK_1, GAME_CONTROLLER_1, BM_BUTTON_KEY1, -BM_COL_SPACING*6.5f },
{ TRACK_2, GAME_CONTROLLER_1, BM_BUTTON_KEY2, -BM_COL_SPACING*5.5f },
{ TRACK_3, GAME_CONTROLLER_1, BM_BUTTON_KEY3, -BM_COL_SPACING*4.5f },
{ TRACK_4, GAME_CONTROLLER_1, BM_BUTTON_KEY4, -BM_COL_SPACING*3.5f },
{ TRACK_5, GAME_CONTROLLER_1, BM_BUTTON_KEY5, -BM_COL_SPACING*2.5f },
{ TRACK_6, GAME_CONTROLLER_1, BM_BUTTON_KEY6, -BM_COL_SPACING*1.5f },
{ TRACK_7, GAME_CONTROLLER_1, BM_BUTTON_KEY7, -BM_COL_SPACING*0.5f },
{ TRACK_9, GAME_CONTROLLER_2, BM_BUTTON_KEY1, +BM_COL_SPACING*0.5f },
{ TRACK_10, GAME_CONTROLLER_2, BM_BUTTON_KEY2, +BM_COL_SPACING*1.5f },
{ TRACK_11, GAME_CONTROLLER_2, BM_BUTTON_KEY3, +BM_COL_SPACING*2.5f },
{ TRACK_12, GAME_CONTROLLER_2, BM_BUTTON_KEY4, +BM_COL_SPACING*3.5f },
{ TRACK_13, GAME_CONTROLLER_2, BM_BUTTON_KEY5, +BM_COL_SPACING*4.5f },
{ TRACK_14, GAME_CONTROLLER_2, BM_BUTTON_KEY6, +BM_COL_SPACING*5.5f },
{ TRACK_15, GAME_CONTROLLER_2, BM_BUTTON_KEY7, +BM_COL_SPACING*6.5f },
{ TRACK_16, GAME_CONTROLLER_2, BM_BUTTON_SCRATCHUP, +BM_COL_SPACING*8.0f },
},
{ // PLAYER_2
{ TRACK_8, GAME_CONTROLLER_1, IIDX_BUTTON_SCRATCHUP, -IIDX_COL_SPACING*8.0f },
{ TRACK_1, GAME_CONTROLLER_1, IIDX_BUTTON_KEY1, -IIDX_COL_SPACING*6.5f },
{ TRACK_2, GAME_CONTROLLER_1, IIDX_BUTTON_KEY2, -IIDX_COL_SPACING*5.5f },
{ TRACK_3, GAME_CONTROLLER_1, IIDX_BUTTON_KEY3, -IIDX_COL_SPACING*4.5f },
{ TRACK_4, GAME_CONTROLLER_1, IIDX_BUTTON_KEY4, -IIDX_COL_SPACING*3.5f },
{ TRACK_5, GAME_CONTROLLER_1, IIDX_BUTTON_KEY5, -IIDX_COL_SPACING*2.5f },
{ TRACK_6, GAME_CONTROLLER_1, IIDX_BUTTON_KEY6, -IIDX_COL_SPACING*1.5f },
{ TRACK_7, GAME_CONTROLLER_1, IIDX_BUTTON_KEY7, -IIDX_COL_SPACING*0.5f },
{ TRACK_9, GAME_CONTROLLER_2, IIDX_BUTTON_KEY1, +IIDX_COL_SPACING*0.5f },
{ TRACK_10, GAME_CONTROLLER_2, IIDX_BUTTON_KEY2, +IIDX_COL_SPACING*1.5f },
{ TRACK_11, GAME_CONTROLLER_2, IIDX_BUTTON_KEY3, +IIDX_COL_SPACING*2.5f },
{ TRACK_12, GAME_CONTROLLER_2, IIDX_BUTTON_KEY4, +IIDX_COL_SPACING*3.5f },
{ TRACK_13, GAME_CONTROLLER_2, IIDX_BUTTON_KEY5, +IIDX_COL_SPACING*4.5f },
{ TRACK_14, GAME_CONTROLLER_2, IIDX_BUTTON_KEY6, +IIDX_COL_SPACING*5.5f },
{ TRACK_15, GAME_CONTROLLER_2, IIDX_BUTTON_KEY7, +IIDX_COL_SPACING*6.5f },
{ TRACK_16, GAME_CONTROLLER_2, IIDX_BUTTON_SCRATCHUP, +IIDX_COL_SPACING*8.0f },
},
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
},
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
},
{ // STYLE_IIDX_SINGLE5
&g_Games[GAME_IIDX], // m_Game
true, // m_bUsedForGameplay
false, // m_bUsedForEdit
false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay
"single5", // m_szName
STEPS_TYPE_IIDX_SINGLE5, // m_StepsType
Style::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
8, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1
{ TRACK_8, GAME_CONTROLLER_1, IIDX_BUTTON_SCRATCHUP, -IIDX_COL_SPACING*3.5f },
{ TRACK_1, GAME_CONTROLLER_1, IIDX_BUTTON_KEY1, -IIDX_COL_SPACING*2.0f },
{ TRACK_2, GAME_CONTROLLER_1, IIDX_BUTTON_KEY2, -IIDX_COL_SPACING*1.0f },
{ TRACK_3, GAME_CONTROLLER_1, IIDX_BUTTON_KEY3, -IIDX_COL_SPACING*0.0f },
{ TRACK_4, GAME_CONTROLLER_1, IIDX_BUTTON_KEY4, +IIDX_COL_SPACING*1.0f },
{ TRACK_5, GAME_CONTROLLER_1, IIDX_BUTTON_KEY5, +IIDX_COL_SPACING*2.0f },
{ TRACK_6, GAME_CONTROLLER_1, IIDX_BUTTON_KEY6, +IIDX_COL_SPACING*3.0f },
{ TRACK_7, GAME_CONTROLLER_1, IIDX_BUTTON_KEY7, +IIDX_COL_SPACING*4.0f },
},
{ // PLAYER_2
{ TRACK_1, GAME_CONTROLLER_2, IIDX_BUTTON_KEY1, -IIDX_COL_SPACING*3.5f },
{ TRACK_2, GAME_CONTROLLER_2, IIDX_BUTTON_KEY2, -IIDX_COL_SPACING*2.5f },
{ TRACK_3, GAME_CONTROLLER_2, IIDX_BUTTON_KEY3, -IIDX_COL_SPACING*1.5f },
{ TRACK_4, GAME_CONTROLLER_2, IIDX_BUTTON_KEY4, -IIDX_COL_SPACING*0.5f },
{ TRACK_5, GAME_CONTROLLER_2, IIDX_BUTTON_KEY5, +IIDX_COL_SPACING*0.5f },
{ TRACK_6, GAME_CONTROLLER_2, IIDX_BUTTON_KEY6, +IIDX_COL_SPACING*1.5f },
{ TRACK_7, GAME_CONTROLLER_2, IIDX_BUTTON_KEY7, +IIDX_COL_SPACING*2.5f },
{ TRACK_8, GAME_CONTROLLER_2, IIDX_BUTTON_SCRATCHUP, +IIDX_COL_SPACING*4.0f },
},
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,1,2,3,4,5,6,7
},
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
},
{ // STYLE_IIDX_DOUBLE5
&g_Games[GAME_IIDX], // m_Game
true, // m_bUsedForGameplay
false, // m_bUsedForEdit
false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay
"double5", // m_szName
STEPS_TYPE_IIDX_DOUBLE5, // m_StepsType
Style::ONE_PLAYER_TWO_CREDITS, // m_StyleType
{ 320, 320 }, // m_iCenterX
16, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1
{ TRACK_8, GAME_CONTROLLER_1, IIDX_BUTTON_SCRATCHUP, -IIDX_COL_SPACING*8.0f },
{ TRACK_1, GAME_CONTROLLER_1, IIDX_BUTTON_KEY1, -IIDX_COL_SPACING*6.5f },
{ TRACK_2, GAME_CONTROLLER_1, IIDX_BUTTON_KEY2, -IIDX_COL_SPACING*5.5f },
{ TRACK_3, GAME_CONTROLLER_1, IIDX_BUTTON_KEY3, -IIDX_COL_SPACING*4.5f },
{ TRACK_4, GAME_CONTROLLER_1, IIDX_BUTTON_KEY4, -IIDX_COL_SPACING*3.5f },
{ TRACK_5, GAME_CONTROLLER_1, IIDX_BUTTON_KEY5, -IIDX_COL_SPACING*2.5f },
{ TRACK_6, GAME_CONTROLLER_1, IIDX_BUTTON_KEY6, -IIDX_COL_SPACING*1.5f },
{ TRACK_7, GAME_CONTROLLER_1, IIDX_BUTTON_KEY7, -IIDX_COL_SPACING*0.5f },
{ TRACK_9, GAME_CONTROLLER_2, IIDX_BUTTON_KEY1, +IIDX_COL_SPACING*0.5f },
{ TRACK_10, GAME_CONTROLLER_2, IIDX_BUTTON_KEY2, +IIDX_COL_SPACING*1.5f },
{ TRACK_11, GAME_CONTROLLER_2, IIDX_BUTTON_KEY3, +IIDX_COL_SPACING*2.5f },
{ TRACK_12, GAME_CONTROLLER_2, IIDX_BUTTON_KEY4, +IIDX_COL_SPACING*3.5f },
{ TRACK_13, GAME_CONTROLLER_2, IIDX_BUTTON_KEY5, +IIDX_COL_SPACING*4.5f },
{ TRACK_14, GAME_CONTROLLER_2, IIDX_BUTTON_KEY6, +IIDX_COL_SPACING*5.5f },
{ TRACK_15, GAME_CONTROLLER_2, IIDX_BUTTON_KEY7, +IIDX_COL_SPACING*6.5f },
{ TRACK_16, GAME_CONTROLLER_2, IIDX_BUTTON_SCRATCHUP, +IIDX_COL_SPACING*8.0f },
},
{ // PLAYER_2
{ TRACK_8, GAME_CONTROLLER_1, IIDX_BUTTON_SCRATCHUP, -IIDX_COL_SPACING*8.0f },
{ TRACK_1, GAME_CONTROLLER_1, IIDX_BUTTON_KEY1, -IIDX_COL_SPACING*6.5f },
{ TRACK_2, GAME_CONTROLLER_1, IIDX_BUTTON_KEY2, -IIDX_COL_SPACING*5.5f },
{ TRACK_3, GAME_CONTROLLER_1, IIDX_BUTTON_KEY3, -IIDX_COL_SPACING*4.5f },
{ TRACK_4, GAME_CONTROLLER_1, IIDX_BUTTON_KEY4, -IIDX_COL_SPACING*3.5f },
{ TRACK_5, GAME_CONTROLLER_1, IIDX_BUTTON_KEY5, -IIDX_COL_SPACING*2.5f },
{ TRACK_6, GAME_CONTROLLER_1, IIDX_BUTTON_KEY6, -IIDX_COL_SPACING*1.5f },
{ TRACK_7, GAME_CONTROLLER_1, IIDX_BUTTON_KEY7, -IIDX_COL_SPACING*0.5f },
{ TRACK_9, GAME_CONTROLLER_2, IIDX_BUTTON_KEY1, +IIDX_COL_SPACING*0.5f },
{ TRACK_10, GAME_CONTROLLER_2, IIDX_BUTTON_KEY2, +IIDX_COL_SPACING*1.5f },
{ TRACK_11, GAME_CONTROLLER_2, IIDX_BUTTON_KEY3, +IIDX_COL_SPACING*2.5f },
{ TRACK_12, GAME_CONTROLLER_2, IIDX_BUTTON_KEY4, +IIDX_COL_SPACING*3.5f },
{ TRACK_13, GAME_CONTROLLER_2, IIDX_BUTTON_KEY5, +IIDX_COL_SPACING*4.5f },
{ TRACK_14, GAME_CONTROLLER_2, IIDX_BUTTON_KEY6, +IIDX_COL_SPACING*5.5f },
{ TRACK_15, GAME_CONTROLLER_2, IIDX_BUTTON_KEY7, +IIDX_COL_SPACING*6.5f },
{ TRACK_16, GAME_CONTROLLER_2, IIDX_BUTTON_SCRATCHUP, +IIDX_COL_SPACING*8.0f },
},
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
},
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
},
{ // STYLE_IIDX_EDIT_SINGLE5
&g_Games[GAME_IIDX], // m_Game
false, // m_bUsedForGameplay
true, // m_bUsedForEdit
false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay
"single5-edit", // m_szName
STEPS_TYPE_IIDX_SINGLE5, // m_StepsType
Style::ONE_PLAYER_ONE_CREDIT, // m_StyleType
{ 160, 480 }, // m_iCenterX
8, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1
{ TRACK_8, GAME_CONTROLLER_1, IIDX_BUTTON_SCRATCHUP, -IIDX_COL_SPACING*3.5f },
{ TRACK_1, GAME_CONTROLLER_1, IIDX_BUTTON_KEY1, -IIDX_COL_SPACING*2.0f },
{ TRACK_2, GAME_CONTROLLER_1, IIDX_BUTTON_KEY2, -IIDX_COL_SPACING*1.0f },
{ TRACK_3, GAME_CONTROLLER_1, IIDX_BUTTON_KEY3, -IIDX_COL_SPACING*0.0f },
{ TRACK_4, GAME_CONTROLLER_1, IIDX_BUTTON_KEY4, +IIDX_COL_SPACING*1.0f },
{ TRACK_5, GAME_CONTROLLER_1, IIDX_BUTTON_KEY5, +IIDX_COL_SPACING*2.0f },
{ TRACK_6, GAME_CONTROLLER_1, IIDX_BUTTON_KEY6, +IIDX_COL_SPACING*3.0f },
{ TRACK_7, GAME_CONTROLLER_1, IIDX_BUTTON_KEY7, +IIDX_COL_SPACING*4.0f },
},
{ // PLAYER_2
{ TRACK_1, GAME_CONTROLLER_2, IIDX_BUTTON_KEY1, -IIDX_COL_SPACING*3.5f },
{ TRACK_2, GAME_CONTROLLER_2, IIDX_BUTTON_KEY2, -IIDX_COL_SPACING*2.5f },
{ TRACK_3, GAME_CONTROLLER_2, IIDX_BUTTON_KEY3, -IIDX_COL_SPACING*1.5f },
{ TRACK_4, GAME_CONTROLLER_2, IIDX_BUTTON_KEY4, -IIDX_COL_SPACING*0.5f },
{ TRACK_5, GAME_CONTROLLER_2, IIDX_BUTTON_KEY5, +IIDX_COL_SPACING*0.5f },
{ TRACK_6, GAME_CONTROLLER_2, IIDX_BUTTON_KEY6, +IIDX_COL_SPACING*1.5f },
{ TRACK_7, GAME_CONTROLLER_2, IIDX_BUTTON_KEY7, +IIDX_COL_SPACING*2.5f },
{ TRACK_8, GAME_CONTROLLER_2, IIDX_BUTTON_SCRATCHUP, +IIDX_COL_SPACING*4.0f },
},
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,1,2,3,4,5,6,7
},
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
},
{ // STYLE_IIDX_EDIT_DOUBLE5
&g_Games[GAME_IIDX], // m_Game
false, // m_bUsedForGameplay
true, // m_bUsedForEdit
false, // m_bUsedForDemonstration
false, // m_bUsedForHowToPlay
"double5-edit", // m_szName
STEPS_TYPE_IIDX_DOUBLE5, // m_StepsType
Style::ONE_PLAYER_TWO_CREDITS, // m_StyleType
{ 320, 320 }, // m_iCenterX
16, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1
{ TRACK_8, GAME_CONTROLLER_1, IIDX_BUTTON_SCRATCHUP, -IIDX_COL_SPACING*8.0f },
{ TRACK_1, GAME_CONTROLLER_1, IIDX_BUTTON_KEY1, -IIDX_COL_SPACING*6.5f },
{ TRACK_2, GAME_CONTROLLER_1, IIDX_BUTTON_KEY2, -IIDX_COL_SPACING*5.5f },
{ TRACK_3, GAME_CONTROLLER_1, IIDX_BUTTON_KEY3, -IIDX_COL_SPACING*4.5f },
{ TRACK_4, GAME_CONTROLLER_1, IIDX_BUTTON_KEY4, -IIDX_COL_SPACING*3.5f },
{ TRACK_5, GAME_CONTROLLER_1, IIDX_BUTTON_KEY5, -IIDX_COL_SPACING*2.5f },
{ TRACK_6, GAME_CONTROLLER_1, IIDX_BUTTON_KEY6, -IIDX_COL_SPACING*1.5f },
{ TRACK_7, GAME_CONTROLLER_1, IIDX_BUTTON_KEY7, -IIDX_COL_SPACING*0.5f },
{ TRACK_9, GAME_CONTROLLER_2, IIDX_BUTTON_KEY1, +IIDX_COL_SPACING*0.5f },
{ TRACK_10, GAME_CONTROLLER_2, IIDX_BUTTON_KEY2, +IIDX_COL_SPACING*1.5f },
{ TRACK_11, GAME_CONTROLLER_2, IIDX_BUTTON_KEY3, +IIDX_COL_SPACING*2.5f },
{ TRACK_12, GAME_CONTROLLER_2, IIDX_BUTTON_KEY4, +IIDX_COL_SPACING*3.5f },
{ TRACK_13, GAME_CONTROLLER_2, IIDX_BUTTON_KEY5, +IIDX_COL_SPACING*4.5f },
{ TRACK_14, GAME_CONTROLLER_2, IIDX_BUTTON_KEY6, +IIDX_COL_SPACING*5.5f },
{ TRACK_15, GAME_CONTROLLER_2, IIDX_BUTTON_KEY7, +IIDX_COL_SPACING*6.5f },
{ TRACK_16, GAME_CONTROLLER_2, IIDX_BUTTON_SCRATCHUP, +IIDX_COL_SPACING*8.0f },
},
{ // PLAYER_2
{ TRACK_8, GAME_CONTROLLER_1, IIDX_BUTTON_SCRATCHUP, -IIDX_COL_SPACING*8.0f },
{ TRACK_1, GAME_CONTROLLER_1, IIDX_BUTTON_KEY1, -IIDX_COL_SPACING*6.5f },
{ TRACK_2, GAME_CONTROLLER_1, IIDX_BUTTON_KEY2, -IIDX_COL_SPACING*5.5f },
{ TRACK_3, GAME_CONTROLLER_1, IIDX_BUTTON_KEY3, -IIDX_COL_SPACING*4.5f },
{ TRACK_4, GAME_CONTROLLER_1, IIDX_BUTTON_KEY4, -IIDX_COL_SPACING*3.5f },
{ TRACK_5, GAME_CONTROLLER_1, IIDX_BUTTON_KEY5, -IIDX_COL_SPACING*2.5f },
{ TRACK_6, GAME_CONTROLLER_1, IIDX_BUTTON_KEY6, -IIDX_COL_SPACING*1.5f },
{ TRACK_7, GAME_CONTROLLER_1, IIDX_BUTTON_KEY7, -IIDX_COL_SPACING*0.5f },
{ TRACK_9, GAME_CONTROLLER_2, IIDX_BUTTON_KEY1, +IIDX_COL_SPACING*0.5f },
{ TRACK_10, GAME_CONTROLLER_2, IIDX_BUTTON_KEY2, +IIDX_COL_SPACING*1.5f },
{ TRACK_11, GAME_CONTROLLER_2, IIDX_BUTTON_KEY3, +IIDX_COL_SPACING*2.5f },
{ TRACK_12, GAME_CONTROLLER_2, IIDX_BUTTON_KEY4, +IIDX_COL_SPACING*3.5f },
{ TRACK_13, GAME_CONTROLLER_2, IIDX_BUTTON_KEY5, +IIDX_COL_SPACING*4.5f },
{ TRACK_14, GAME_CONTROLLER_2, IIDX_BUTTON_KEY6, +IIDX_COL_SPACING*5.5f },
{ TRACK_15, GAME_CONTROLLER_2, IIDX_BUTTON_KEY7, +IIDX_COL_SPACING*6.5f },
{ TRACK_16, GAME_CONTROLLER_2, IIDX_BUTTON_SCRATCHUP, +IIDX_COL_SPACING*8.0f },
{ TRACK_8, GAME_CONTROLLER_1, BM_BUTTON_SCRATCHUP, -BM_COL_SPACING*8.0f },
{ TRACK_1, GAME_CONTROLLER_1, BM_BUTTON_KEY1, -BM_COL_SPACING*6.5f },
{ TRACK_2, GAME_CONTROLLER_1, BM_BUTTON_KEY2, -BM_COL_SPACING*5.5f },
{ TRACK_3, GAME_CONTROLLER_1, BM_BUTTON_KEY3, -BM_COL_SPACING*4.5f },
{ TRACK_4, GAME_CONTROLLER_1, BM_BUTTON_KEY4, -BM_COL_SPACING*3.5f },
{ TRACK_5, GAME_CONTROLLER_1, BM_BUTTON_KEY5, -BM_COL_SPACING*2.5f },
{ TRACK_6, GAME_CONTROLLER_1, BM_BUTTON_KEY6, -BM_COL_SPACING*1.5f },
{ TRACK_7, GAME_CONTROLLER_1, BM_BUTTON_KEY7, -BM_COL_SPACING*0.5f },
{ TRACK_9, GAME_CONTROLLER_2, BM_BUTTON_KEY1, +BM_COL_SPACING*0.5f },
{ TRACK_10, GAME_CONTROLLER_2, BM_BUTTON_KEY2, +BM_COL_SPACING*1.5f },
{ TRACK_11, GAME_CONTROLLER_2, BM_BUTTON_KEY3, +BM_COL_SPACING*2.5f },
{ TRACK_12, GAME_CONTROLLER_2, BM_BUTTON_KEY4, +BM_COL_SPACING*3.5f },
{ TRACK_13, GAME_CONTROLLER_2, BM_BUTTON_KEY5, +BM_COL_SPACING*4.5f },
{ TRACK_14, GAME_CONTROLLER_2, BM_BUTTON_KEY6, +BM_COL_SPACING*5.5f },
{ TRACK_15, GAME_CONTROLLER_2, BM_BUTTON_KEY7, +BM_COL_SPACING*6.5f },
{ TRACK_16, GAME_CONTROLLER_2, BM_BUTTON_SCRATCHUP, +BM_COL_SPACING*8.0f },
},
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
stepmania/src/NotesLoaderBMS.cpp
+8 -8
View File
@@ -111,16 +111,16 @@ StepsType BMSLoader::CheckTracksMagic()
case 8:
// Could also be couple or 7-key.
if (iTracks[7] == 0 && iTracks[8] == 0 && iTracks[1] == 0 && iTracks[3] == 0)
// these four tracks are IIDX-related
// these four tracks are BM-related
return STEPS_TYPE_DANCE_DOUBLE;
else
return STEPS_TYPE_IIDX_SINGLE7;
return STEPS_TYPE_BM_SINGLE7;
case 9:
return STEPS_TYPE_PNM_NINE;
case 12:
return STEPS_TYPE_BM_DOUBLE;
return STEPS_TYPE_BM_DOUBLE5;
case 16:
return STEPS_TYPE_IIDX_DOUBLE7;
return STEPS_TYPE_BM_DOUBLE7;
default:
return STEPS_TYPE_INVALID;
}
@@ -343,7 +343,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out )
iTransformNewToOld[7] = BMS_P2_TURN;
break;
case STEPS_TYPE_DANCE_SOLO:
case STEPS_TYPE_BM_SINGLE:
case STEPS_TYPE_BM_SINGLE5:
// Hey! Why the hell are these exactly the same? :-)
iTransformNewToOld[0] = BMS_P1_KEY1;
iTransformNewToOld[1] = BMS_P1_KEY2;
@@ -372,7 +372,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out )
iTransformNewToOld[7] = BMS_P2_KEY4; // ryellow
iTransformNewToOld[8] = BMS_P2_KEY5; // rwhite
break;
case STEPS_TYPE_BM_DOUBLE:
case STEPS_TYPE_BM_DOUBLE5:
iTransformNewToOld[0] = BMS_P1_KEY1;
iTransformNewToOld[1] = BMS_P1_KEY2;
iTransformNewToOld[2] = BMS_P1_KEY3;
@@ -386,7 +386,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out )
iTransformNewToOld[10] = BMS_P2_KEY5;
iTransformNewToOld[11] = BMS_P2_TURN;
break;
case STEPS_TYPE_IIDX_SINGLE7:
case STEPS_TYPE_BM_SINGLE7:
iTransformNewToOld[0] = BMS_P1_KEY1;
iTransformNewToOld[1] = BMS_P1_KEY2;
iTransformNewToOld[2] = BMS_P1_KEY3;
@@ -396,7 +396,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out )
iTransformNewToOld[6] = BMS_P1_KEY7;
iTransformNewToOld[7] = BMS_P1_TURN;
break;
case STEPS_TYPE_IIDX_DOUBLE7:
case STEPS_TYPE_BM_DOUBLE7:
iTransformNewToOld[0] = BMS_P1_KEY1;
iTransformNewToOld[1] = BMS_P1_KEY2;
iTransformNewToOld[2] = BMS_P1_KEY3;