diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp index 79cb81f934..d9c001eb3c 100644 --- a/stepmania/src/GameManager.cpp +++ b/stepmania/src/GameManager.cpp @@ -1131,18 +1131,22 @@ Style g_Styles[] = 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, DANCE_BUTTON_LEFT, -DANCE_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_1, DANCE_BUTTON_DOWN, -DANCE_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_1, DANCE_BUTTON_UP, +DANCE_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_1, DANCE_BUTTON_RIGHT, +DANCE_COL_SPACING*1.5f }, + { TRACK_1, -DANCE_COL_SPACING*1.5f }, + { TRACK_2, -DANCE_COL_SPACING*0.5f }, + { TRACK_3, +DANCE_COL_SPACING*0.5f }, + { TRACK_4, +DANCE_COL_SPACING*1.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, DANCE_BUTTON_LEFT, -DANCE_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_2, DANCE_BUTTON_DOWN, -DANCE_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_2, DANCE_BUTTON_UP, +DANCE_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_2, DANCE_BUTTON_RIGHT, +DANCE_COL_SPACING*1.5f }, + { TRACK_1, -DANCE_COL_SPACING*1.5f }, + { TRACK_2, -DANCE_COL_SPACING*0.5f }, + { TRACK_3, +DANCE_COL_SPACING*0.5f }, + { TRACK_4, +DANCE_COL_SPACING*1.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 3, 2, 1 }, + { 0, 3, 2, 1 } + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0, 1, 2, 3 }, @@ -1161,18 +1165,22 @@ Style g_Styles[] = 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, DANCE_BUTTON_LEFT, -DANCE_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_1, DANCE_BUTTON_DOWN, -DANCE_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_1, DANCE_BUTTON_UP, +DANCE_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_1, DANCE_BUTTON_RIGHT, +DANCE_COL_SPACING*1.5f }, + { TRACK_1, -DANCE_COL_SPACING*1.5f }, + { TRACK_2, -DANCE_COL_SPACING*0.5f }, + { TRACK_3, +DANCE_COL_SPACING*0.5f }, + { TRACK_4, +DANCE_COL_SPACING*1.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, DANCE_BUTTON_LEFT, -DANCE_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_2, DANCE_BUTTON_DOWN, -DANCE_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_2, DANCE_BUTTON_UP, +DANCE_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_2, DANCE_BUTTON_RIGHT, +DANCE_COL_SPACING*1.5f }, + { TRACK_1, -DANCE_COL_SPACING*1.5f }, + { TRACK_2, -DANCE_COL_SPACING*0.5f }, + { TRACK_3, +DANCE_COL_SPACING*0.5f }, + { TRACK_4, +DANCE_COL_SPACING*1.5f }, }, }, + { + { 0, 3, 2, 1 }, + { 0, 3, 2, 1 } + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0, 1, 2, 3 }, @@ -1191,26 +1199,30 @@ Style g_Styles[] = 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, DANCE_BUTTON_LEFT, -DANCE_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_1, DANCE_BUTTON_DOWN, -DANCE_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_1, DANCE_BUTTON_UP, -DANCE_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_1, DANCE_BUTTON_RIGHT, -DANCE_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, DANCE_BUTTON_LEFT, +DANCE_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, DANCE_BUTTON_DOWN, +DANCE_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_2, DANCE_BUTTON_UP, +DANCE_COL_SPACING*2.5f }, - { TRACK_8, GAME_CONTROLLER_2, DANCE_BUTTON_RIGHT, +DANCE_COL_SPACING*3.5f }, + { TRACK_1, -DANCE_COL_SPACING*3.5f }, + { TRACK_2, -DANCE_COL_SPACING*2.5f }, + { TRACK_3, -DANCE_COL_SPACING*1.5f }, + { TRACK_4, -DANCE_COL_SPACING*0.5f }, + { TRACK_5, +DANCE_COL_SPACING*0.5f }, + { TRACK_6, +DANCE_COL_SPACING*1.5f }, + { TRACK_7, +DANCE_COL_SPACING*2.5f }, + { TRACK_8, +DANCE_COL_SPACING*3.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_1, DANCE_BUTTON_LEFT, -DANCE_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_1, DANCE_BUTTON_DOWN, -DANCE_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_1, DANCE_BUTTON_UP, -DANCE_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_1, DANCE_BUTTON_RIGHT, -DANCE_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, DANCE_BUTTON_LEFT, +DANCE_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, DANCE_BUTTON_DOWN, +DANCE_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_2, DANCE_BUTTON_UP, +DANCE_COL_SPACING*2.5f }, - { TRACK_8, GAME_CONTROLLER_2, DANCE_BUTTON_RIGHT, +DANCE_COL_SPACING*3.5f }, + { TRACK_1, -DANCE_COL_SPACING*3.5f }, + { TRACK_2, -DANCE_COL_SPACING*2.5f }, + { TRACK_3, -DANCE_COL_SPACING*1.5f }, + { TRACK_4, -DANCE_COL_SPACING*0.5f }, + { TRACK_5, +DANCE_COL_SPACING*0.5f }, + { TRACK_6, +DANCE_COL_SPACING*1.5f }, + { TRACK_7, +DANCE_COL_SPACING*2.5f }, + { TRACK_8, +DANCE_COL_SPACING*3.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 3, 2, 1, Style::END_MAPPING }, + { 4, 7, 6, 5, Style::END_MAPPING } + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7 }, @@ -1229,18 +1241,22 @@ Style g_Styles[] = 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, DANCE_BUTTON_LEFT, -DANCE_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_1, DANCE_BUTTON_DOWN, -DANCE_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_1, DANCE_BUTTON_UP, +DANCE_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_1, DANCE_BUTTON_RIGHT, +DANCE_COL_SPACING*1.5f }, + { TRACK_1, -DANCE_COL_SPACING*1.5f }, + { TRACK_2, -DANCE_COL_SPACING*0.5f }, + { TRACK_3, +DANCE_COL_SPACING*0.5f }, + { TRACK_4, +DANCE_COL_SPACING*1.5f }, }, { // PLAYER_2 - { TRACK_5, GAME_CONTROLLER_2, DANCE_BUTTON_LEFT, -DANCE_COL_SPACING*1.5f }, - { TRACK_6, GAME_CONTROLLER_2, DANCE_BUTTON_DOWN, -DANCE_COL_SPACING*0.5f }, - { TRACK_7, GAME_CONTROLLER_2, DANCE_BUTTON_UP, +DANCE_COL_SPACING*0.5f }, - { TRACK_8, GAME_CONTROLLER_2, DANCE_BUTTON_RIGHT, +DANCE_COL_SPACING*1.5f }, + { TRACK_5, -DANCE_COL_SPACING*1.5f }, + { TRACK_6, -DANCE_COL_SPACING*0.5f }, + { TRACK_7, +DANCE_COL_SPACING*0.5f }, + { TRACK_8, +DANCE_COL_SPACING*1.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 3, 2, 1 }, + { 0, 3, 2, 1 } + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3 }, @@ -1259,23 +1275,27 @@ Style g_Styles[] = 6, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, DANCE_BUTTON_LEFT, -DANCE_COL_SPACING*2.5f }, - { TRACK_2, GAME_CONTROLLER_1, DANCE_BUTTON_UPLEFT, -DANCE_COL_SPACING*1.5f }, - { TRACK_3, GAME_CONTROLLER_1, DANCE_BUTTON_DOWN, -DANCE_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_1, DANCE_BUTTON_UP, +DANCE_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_1, DANCE_BUTTON_UPRIGHT, +DANCE_COL_SPACING*1.5f }, - { TRACK_6, GAME_CONTROLLER_1, DANCE_BUTTON_RIGHT, +DANCE_COL_SPACING*2.5f }, + { TRACK_1, -DANCE_COL_SPACING*2.5f }, + { TRACK_2, -DANCE_COL_SPACING*1.5f }, + { TRACK_3, -DANCE_COL_SPACING*0.5f }, + { TRACK_4, +DANCE_COL_SPACING*0.5f }, + { TRACK_5, +DANCE_COL_SPACING*1.5f }, + { TRACK_6, +DANCE_COL_SPACING*2.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, DANCE_BUTTON_LEFT, -DANCE_COL_SPACING*2.5f }, - { TRACK_2, GAME_CONTROLLER_2, DANCE_BUTTON_UPLEFT, -DANCE_COL_SPACING*1.5f }, - { TRACK_3, GAME_CONTROLLER_2, DANCE_BUTTON_DOWN, -DANCE_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_2, DANCE_BUTTON_UP, +DANCE_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, DANCE_BUTTON_UPRIGHT, +DANCE_COL_SPACING*1.5f }, - { TRACK_6, GAME_CONTROLLER_2, DANCE_BUTTON_RIGHT, +DANCE_COL_SPACING*2.5f }, + { TRACK_1, -DANCE_COL_SPACING*2.5f }, + { TRACK_2, -DANCE_COL_SPACING*1.5f }, + { TRACK_3, -DANCE_COL_SPACING*0.5f }, + { TRACK_4, +DANCE_COL_SPACING*0.5f }, + { TRACK_5, +DANCE_COL_SPACING*1.5f }, + { TRACK_6, +DANCE_COL_SPACING*2.5f }, }, }, - { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 5, 3, 2, 1, 4 }, + { 0, 5, 3, 2, 1, 4 } + }, + { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5 }, false, // m_bNeedsZoomOutWith2Players @@ -1293,26 +1313,30 @@ Style g_Styles[] = 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, DANCE_BUTTON_LEFT, -DANCE_COL_SPACING*4.0f }, - { TRACK_2, GAME_CONTROLLER_1, DANCE_BUTTON_DOWN, -DANCE_COL_SPACING*3.0f }, - { TRACK_3, GAME_CONTROLLER_1, DANCE_BUTTON_UP, -DANCE_COL_SPACING*2.0f }, - { TRACK_4, GAME_CONTROLLER_1, DANCE_BUTTON_RIGHT, -DANCE_COL_SPACING*1.0f }, - { TRACK_5, GAME_CONTROLLER_2, DANCE_BUTTON_LEFT, +DANCE_COL_SPACING*1.0f }, - { TRACK_6, GAME_CONTROLLER_2, DANCE_BUTTON_DOWN, +DANCE_COL_SPACING*2.0f }, - { TRACK_7, GAME_CONTROLLER_2, DANCE_BUTTON_UP, +DANCE_COL_SPACING*3.0f }, - { TRACK_8, GAME_CONTROLLER_2, DANCE_BUTTON_RIGHT, +DANCE_COL_SPACING*4.0f }, + { TRACK_1, -DANCE_COL_SPACING*4.0f }, + { TRACK_2, -DANCE_COL_SPACING*3.0f }, + { TRACK_3, -DANCE_COL_SPACING*2.0f }, + { TRACK_4, -DANCE_COL_SPACING*1.0f }, + { TRACK_5, +DANCE_COL_SPACING*1.0f }, + { TRACK_6, +DANCE_COL_SPACING*2.0f }, + { TRACK_7, +DANCE_COL_SPACING*3.0f }, + { TRACK_8, +DANCE_COL_SPACING*4.0f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_1, DANCE_BUTTON_LEFT, -DANCE_COL_SPACING*4.0f }, - { TRACK_2, GAME_CONTROLLER_1, DANCE_BUTTON_DOWN, -DANCE_COL_SPACING*3.0f }, - { TRACK_3, GAME_CONTROLLER_1, DANCE_BUTTON_UP, -DANCE_COL_SPACING*2.0f }, - { TRACK_4, GAME_CONTROLLER_1, DANCE_BUTTON_RIGHT, -DANCE_COL_SPACING*1.0f }, - { TRACK_5, GAME_CONTROLLER_2, DANCE_BUTTON_LEFT, +DANCE_COL_SPACING*1.0f }, - { TRACK_6, GAME_CONTROLLER_2, DANCE_BUTTON_DOWN, +DANCE_COL_SPACING*2.0f }, - { TRACK_7, GAME_CONTROLLER_2, DANCE_BUTTON_UP, +DANCE_COL_SPACING*3.0f }, - { TRACK_8, GAME_CONTROLLER_2, DANCE_BUTTON_RIGHT, +DANCE_COL_SPACING*4.0f }, + { TRACK_1, -DANCE_COL_SPACING*4.0f }, + { TRACK_2, -DANCE_COL_SPACING*3.0f }, + { TRACK_3, -DANCE_COL_SPACING*2.0f }, + { TRACK_4, -DANCE_COL_SPACING*1.0f }, + { TRACK_5, +DANCE_COL_SPACING*1.0f }, + { TRACK_6, +DANCE_COL_SPACING*2.0f }, + { TRACK_7, +DANCE_COL_SPACING*3.0f }, + { TRACK_8, +DANCE_COL_SPACING*4.0f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 1, 2, 3, Style::END_MAPPING }, + { 4, 5, 6, 7, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7 }, @@ -1326,22 +1350,26 @@ Style g_Styles[] = 6, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, DANCE_BUTTON_LEFT, -DANCE_6PANEL_VERSUS_COL_SPACING*2.5f }, - { TRACK_2, GAME_CONTROLLER_1, DANCE_BUTTON_UPLEFT, -DANCE_6PANEL_VERSUS_COL_SPACING*1.5f }, - { TRACK_3, GAME_CONTROLLER_1, DANCE_BUTTON_DOWN, -DANCE_6PANEL_VERSUS_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_1, DANCE_BUTTON_UP, +DANCE_6PANEL_VERSUS_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_1, DANCE_BUTTON_UPRIGHT, +DANCE_6PANEL_VERSUS_COL_SPACING*1.5f }, - { TRACK_6, GAME_CONTROLLER_1, DANCE_BUTTON_RIGHT, +DANCE_6PANEL_VERSUS_COL_SPACING*2.5f }, + { TRACK_1, -DANCE_6PANEL_VERSUS_COL_SPACING*2.5f }, + { TRACK_2, -DANCE_6PANEL_VERSUS_COL_SPACING*1.5f }, + { TRACK_3, -DANCE_6PANEL_VERSUS_COL_SPACING*0.5f }, + { TRACK_4, +DANCE_6PANEL_VERSUS_COL_SPACING*0.5f }, + { TRACK_5, +DANCE_6PANEL_VERSUS_COL_SPACING*1.5f }, + { TRACK_6, +DANCE_6PANEL_VERSUS_COL_SPACING*2.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, DANCE_BUTTON_LEFT, -DANCE_6PANEL_VERSUS_COL_SPACING*2.5f }, - { TRACK_2, GAME_CONTROLLER_2, DANCE_BUTTON_UPLEFT, -DANCE_6PANEL_VERSUS_COL_SPACING*1.5f }, - { TRACK_3, GAME_CONTROLLER_2, DANCE_BUTTON_DOWN, -DANCE_6PANEL_VERSUS_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_2, DANCE_BUTTON_UP, +DANCE_6PANEL_VERSUS_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, DANCE_BUTTON_UPRIGHT, +DANCE_6PANEL_VERSUS_COL_SPACING*1.5f }, - { TRACK_6, GAME_CONTROLLER_2, DANCE_BUTTON_RIGHT, +DANCE_6PANEL_VERSUS_COL_SPACING*2.5f }, + { TRACK_1, -DANCE_6PANEL_VERSUS_COL_SPACING*2.5f }, + { TRACK_2, -DANCE_6PANEL_VERSUS_COL_SPACING*1.5f }, + { TRACK_3, -DANCE_6PANEL_VERSUS_COL_SPACING*0.5f }, + { TRACK_4, +DANCE_6PANEL_VERSUS_COL_SPACING*0.5f }, + { TRACK_5, +DANCE_6PANEL_VERSUS_COL_SPACING*1.5f }, + { TRACK_6, +DANCE_6PANEL_VERSUS_COL_SPACING*2.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 5, 3, 2, 1, 4 }, + { 0, 5, 3, 2, 1, 4 } + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,5,1,4,2,3 // outside in }, @@ -1360,20 +1388,24 @@ Style g_Styles[] = 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_1, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_1, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_1, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*2 }, + { TRACK_1, -PUMP_COL_SPACING*2 }, + { TRACK_2, -PUMP_COL_SPACING*1 }, + { TRACK_3, +PUMP_COL_SPACING*0 }, + { TRACK_4, +PUMP_COL_SPACING*1 }, + { TRACK_5, +PUMP_COL_SPACING*2 }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_2, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_2, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_2, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*2 }, + { TRACK_1, -PUMP_COL_SPACING*2 }, + { TRACK_2, -PUMP_COL_SPACING*1 }, + { TRACK_3, +PUMP_COL_SPACING*0 }, + { TRACK_4, +PUMP_COL_SPACING*1 }, + { TRACK_5, +PUMP_COL_SPACING*2 }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 1, 3, 2, 0, 4, Style::END_MAPPING }, + { 1, 3, 2, 0, 4, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,2,4,1,3 }, @@ -1392,20 +1424,24 @@ Style g_Styles[] = 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_1, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_1, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_1, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*2 }, + { TRACK_1, -PUMP_COL_SPACING*2 }, + { TRACK_2, -PUMP_COL_SPACING*1 }, + { TRACK_3, +PUMP_COL_SPACING*0 }, + { TRACK_4, +PUMP_COL_SPACING*1 }, + { TRACK_5, +PUMP_COL_SPACING*2 }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_2, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_2, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_2, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*2 }, + { TRACK_1, -PUMP_COL_SPACING*2 }, + { TRACK_2, -PUMP_COL_SPACING*1 }, + { TRACK_3, +PUMP_COL_SPACING*0 }, + { TRACK_4, +PUMP_COL_SPACING*1 }, + { TRACK_5, +PUMP_COL_SPACING*2 }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 1, 3, 2, 0, 4, Style::END_MAPPING }, + { 1, 3, 2, 0, 4, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,2,4,1,3 }, @@ -1424,22 +1460,26 @@ Style g_Styles[] = 6, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, PUMP_BUTTON_CENTER, -PUMP_COL_SPACING*2.5f }, - { TRACK_2, GAME_CONTROLLER_1, PUMP_BUTTON_UPRIGHT, -PUMP_COL_SPACING*1.5f }, - { TRACK_3, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNRIGHT, -PUMP_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, +PUMP_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, PUMP_BUTTON_UPLEFT, +PUMP_COL_SPACING*1.5f }, - { TRACK_6, GAME_CONTROLLER_2, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*2.5f }, + { TRACK_1, -PUMP_COL_SPACING*2.5f }, + { TRACK_2, -PUMP_COL_SPACING*1.5f }, + { TRACK_3, -PUMP_COL_SPACING*0.5f }, + { TRACK_4, +PUMP_COL_SPACING*0.5f }, + { TRACK_5, +PUMP_COL_SPACING*1.5f }, + { TRACK_6, +PUMP_COL_SPACING*2.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_1, PUMP_BUTTON_CENTER, -PUMP_COL_SPACING*2.5f }, - { TRACK_2, GAME_CONTROLLER_1, PUMP_BUTTON_UPRIGHT, -PUMP_COL_SPACING*1.5f }, - { TRACK_3, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNRIGHT, -PUMP_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, +PUMP_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, PUMP_BUTTON_UPLEFT, +PUMP_COL_SPACING*1.5f }, - { TRACK_6, GAME_CONTROLLER_2, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*2.5f }, + { TRACK_1, -PUMP_COL_SPACING*2.5f }, + { TRACK_2, -PUMP_COL_SPACING*1.5f }, + { TRACK_3, -PUMP_COL_SPACING*0.5f }, + { TRACK_4, +PUMP_COL_SPACING*0.5f }, + { TRACK_5, +PUMP_COL_SPACING*1.5f }, + { TRACK_6, +PUMP_COL_SPACING*2.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { Style::NO_MAPPING, 1, 0, Style::NO_MAPPING, 2, Style::END_MAPPING }, + { 3, Style::NO_MAPPING, 5, 4, Style::NO_MAPPING } + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,5,2,4,3,1 }, @@ -1458,30 +1498,34 @@ Style g_Styles[] = 10, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*4.5f }, - { TRACK_2, GAME_CONTROLLER_1, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*3.5f }, - { TRACK_3, GAME_CONTROLLER_1, PUMP_BUTTON_CENTER, -PUMP_COL_SPACING*2.5f }, - { TRACK_4, GAME_CONTROLLER_1, PUMP_BUTTON_UPRIGHT, -PUMP_COL_SPACING*1.5f }, - { TRACK_5, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNRIGHT, -PUMP_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, +PUMP_COL_SPACING*0.5f }, - { TRACK_7, GAME_CONTROLLER_2, PUMP_BUTTON_UPLEFT, +PUMP_COL_SPACING*1.5f }, - { TRACK_8, GAME_CONTROLLER_2, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*2.5f }, - { TRACK_9, GAME_CONTROLLER_2, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*3.5f }, - { TRACK_10, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*4.5f }, + { TRACK_1, -PUMP_COL_SPACING*4.5f }, + { TRACK_2, -PUMP_COL_SPACING*3.5f }, + { TRACK_3, -PUMP_COL_SPACING*2.5f }, + { TRACK_4, -PUMP_COL_SPACING*1.5f }, + { TRACK_5, -PUMP_COL_SPACING*0.5f }, + { TRACK_6, +PUMP_COL_SPACING*0.5f }, + { TRACK_7, +PUMP_COL_SPACING*1.5f }, + { TRACK_8, +PUMP_COL_SPACING*2.5f }, + { TRACK_9, +PUMP_COL_SPACING*3.5f }, + { TRACK_10, +PUMP_COL_SPACING*4.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*4.5f }, - { TRACK_2, GAME_CONTROLLER_1, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*3.5f }, - { TRACK_3, GAME_CONTROLLER_1, PUMP_BUTTON_CENTER, -PUMP_COL_SPACING*2.5f }, - { TRACK_4, GAME_CONTROLLER_1, PUMP_BUTTON_UPRIGHT, -PUMP_COL_SPACING*1.5f }, - { TRACK_5, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNRIGHT, -PUMP_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, +PUMP_COL_SPACING*0.5f }, - { TRACK_7, GAME_CONTROLLER_2, PUMP_BUTTON_UPLEFT, +PUMP_COL_SPACING*1.5f }, - { TRACK_8, GAME_CONTROLLER_2, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*2.5f }, - { TRACK_9, GAME_CONTROLLER_2, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*3.5f }, - { TRACK_10, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*4.5f }, + { TRACK_1, -PUMP_COL_SPACING*4.5f }, + { TRACK_2, -PUMP_COL_SPACING*3.5f }, + { TRACK_3, -PUMP_COL_SPACING*2.5f }, + { TRACK_4, -PUMP_COL_SPACING*1.5f }, + { TRACK_5, -PUMP_COL_SPACING*0.5f }, + { TRACK_6, +PUMP_COL_SPACING*0.5f }, + { TRACK_7, +PUMP_COL_SPACING*1.5f }, + { TRACK_8, +PUMP_COL_SPACING*2.5f }, + { TRACK_9, +PUMP_COL_SPACING*3.5f }, + { TRACK_10, +PUMP_COL_SPACING*4.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 1, 3, 2, 0, 4, 6, 8, 7, 5, 9, Style::END_MAPPING }, + { 1, 3, 2, 0, 4, 6, 8, 7, 5, 9, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,2,4,1,3,5,7,9,6,8 }, @@ -1500,20 +1544,24 @@ Style g_Styles[] = 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_1, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_1, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_1, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*2 }, + { TRACK_1, -PUMP_COL_SPACING*2 }, + { TRACK_2, -PUMP_COL_SPACING*1 }, + { TRACK_3, +PUMP_COL_SPACING*0 }, + { TRACK_4, +PUMP_COL_SPACING*1 }, + { TRACK_5, +PUMP_COL_SPACING*2 }, }, { // PLAYER_2 - { TRACK_6, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*2 }, - { TRACK_7, GAME_CONTROLLER_2, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*1 }, - { TRACK_8, GAME_CONTROLLER_2, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*0 }, - { TRACK_9, GAME_CONTROLLER_2, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*1 }, - { TRACK_10, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*2 }, + { TRACK_6, -PUMP_COL_SPACING*2 }, + { TRACK_7, -PUMP_COL_SPACING*1 }, + { TRACK_8, +PUMP_COL_SPACING*0 }, + { TRACK_9, +PUMP_COL_SPACING*1 }, + { TRACK_10, +PUMP_COL_SPACING*2 }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 1, 3, 2, 0, 4, Style::END_MAPPING }, + { 1, 3, 2, 0, 4, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,2,4,1,3 }, @@ -1532,25 +1580,29 @@ Style g_Styles[] = 10, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*5.0 }, - { TRACK_2, GAME_CONTROLLER_1, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*4.0 }, - { TRACK_3, GAME_CONTROLLER_1, PUMP_BUTTON_CENTER, -PUMP_COL_SPACING*3.0 }, - { TRACK_4, GAME_CONTROLLER_1, PUMP_BUTTON_UPRIGHT, -PUMP_COL_SPACING*2.0 }, - { TRACK_5, GAME_CONTROLLER_1, PUMP_BUTTON_DOWNRIGHT, -PUMP_COL_SPACING*1.0 }, - { TRACK_6, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, +PUMP_COL_SPACING*1.0 }, - { TRACK_7, GAME_CONTROLLER_2, PUMP_BUTTON_UPLEFT, +PUMP_COL_SPACING*2.0 }, - { TRACK_8, GAME_CONTROLLER_2, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*3.0 }, - { TRACK_9, GAME_CONTROLLER_2, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*4.0 }, - { TRACK_10, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*5.0 }, + { TRACK_1, -PUMP_COL_SPACING*5.0 }, + { TRACK_2, -PUMP_COL_SPACING*4.0 }, + { TRACK_3, -PUMP_COL_SPACING*3.0 }, + { TRACK_4, -PUMP_COL_SPACING*2.0 }, + { TRACK_5, -PUMP_COL_SPACING*1.0 }, + { TRACK_6, +PUMP_COL_SPACING*1.0 }, + { TRACK_7, +PUMP_COL_SPACING*2.0 }, + { TRACK_8, +PUMP_COL_SPACING*3.0 }, + { TRACK_9, +PUMP_COL_SPACING*4.0 }, + { TRACK_10, +PUMP_COL_SPACING*5.0 }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNLEFT, -PUMP_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_2, PUMP_BUTTON_UPLEFT, -PUMP_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_2, PUMP_BUTTON_CENTER, +PUMP_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_2, PUMP_BUTTON_UPRIGHT, +PUMP_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_2, PUMP_BUTTON_DOWNRIGHT, +PUMP_COL_SPACING*2 }, + { TRACK_1, -PUMP_COL_SPACING*2 }, + { TRACK_2, -PUMP_COL_SPACING*1 }, + { TRACK_3, +PUMP_COL_SPACING*0 }, + { TRACK_4, +PUMP_COL_SPACING*1 }, + { TRACK_5, +PUMP_COL_SPACING*2 }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 1, 3, 2, 0, 4, 6, 8, 7, 5, 9, Style::END_MAPPING }, + { 1, 3, 2, 0, 4, 6, 8, 7, 5, 9, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,2,4,1,3 }, @@ -1569,20 +1621,24 @@ Style g_Styles[] = 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTUPLEFT, -EZ2_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_1, EZ2_BUTTON_HANDUPLEFT, -EZ2_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTDOWN, +EZ2_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_1, EZ2_BUTTON_HANDUPRIGHT, +EZ2_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTUPRIGHT, +EZ2_COL_SPACING*2 }, + { TRACK_1, -EZ2_COL_SPACING*2 }, + { TRACK_2, -EZ2_COL_SPACING*1 }, + { TRACK_3, +EZ2_COL_SPACING*0 }, + { TRACK_4, +EZ2_COL_SPACING*1 }, + { TRACK_5, +EZ2_COL_SPACING*2 }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTUPLEFT, -EZ2_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_2, EZ2_BUTTON_HANDUPLEFT, -EZ2_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTDOWN, +EZ2_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_2, EZ2_BUTTON_HANDUPRIGHT, +EZ2_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTUPRIGHT, +EZ2_COL_SPACING*2 }, + { TRACK_1, -EZ2_COL_SPACING*2 }, + { TRACK_2, -EZ2_COL_SPACING*1 }, + { TRACK_3, +EZ2_COL_SPACING*0 }, + { TRACK_4, +EZ2_COL_SPACING*1 }, + { TRACK_5, +EZ2_COL_SPACING*2 }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 4, 2, 1, 3, Style::END_MAPPING }, + { 0, 4, 2, 1, 3, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 2,0,4,1,3 // This should be from back to front: Down, UpLeft, UpRight, Upper Left Hand, Upper Right Hand }, @@ -1601,24 +1657,28 @@ Style g_Styles[] = 7, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTUPLEFT, -EZ2_REAL_COL_SPACING*3 }, - { TRACK_2, GAME_CONTROLLER_1, EZ2_BUTTON_HANDLRLEFT, -EZ2_REAL_COL_SPACING*2 }, - { TRACK_3, GAME_CONTROLLER_1, EZ2_BUTTON_HANDUPLEFT, -EZ2_REAL_COL_SPACING*1 }, - { TRACK_4, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTDOWN, +EZ2_REAL_COL_SPACING*0 }, - { TRACK_5, GAME_CONTROLLER_1, EZ2_BUTTON_HANDUPRIGHT, +EZ2_REAL_COL_SPACING*1 }, - { TRACK_6, GAME_CONTROLLER_1, EZ2_BUTTON_HANDLRRIGHT, +EZ2_REAL_COL_SPACING*2 }, - { TRACK_7, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTUPRIGHT, +EZ2_REAL_COL_SPACING*3 }, + { TRACK_1, -EZ2_REAL_COL_SPACING*3 }, + { TRACK_2, -EZ2_REAL_COL_SPACING*2 }, + { TRACK_3, -EZ2_REAL_COL_SPACING*1 }, + { TRACK_4, +EZ2_REAL_COL_SPACING*0 }, + { TRACK_5, +EZ2_REAL_COL_SPACING*1 }, + { TRACK_6, +EZ2_REAL_COL_SPACING*2 }, + { TRACK_7, +EZ2_REAL_COL_SPACING*3 }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTUPLEFT, -EZ2_REAL_COL_SPACING*3 }, - { TRACK_2, GAME_CONTROLLER_2, EZ2_BUTTON_HANDLRLEFT, -EZ2_REAL_COL_SPACING*2 }, - { TRACK_3, GAME_CONTROLLER_2, EZ2_BUTTON_HANDUPLEFT, -EZ2_REAL_COL_SPACING*1 }, - { TRACK_4, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTDOWN, +EZ2_REAL_COL_SPACING*0 }, - { TRACK_5, GAME_CONTROLLER_2, EZ2_BUTTON_HANDUPRIGHT, +EZ2_REAL_COL_SPACING*1 }, - { TRACK_6, GAME_CONTROLLER_2, EZ2_BUTTON_HANDLRRIGHT, +EZ2_REAL_COL_SPACING*2 }, - { TRACK_7, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTUPRIGHT, +EZ2_REAL_COL_SPACING*3 }, + { TRACK_1, -EZ2_REAL_COL_SPACING*3 }, + { TRACK_2, -EZ2_REAL_COL_SPACING*2 }, + { TRACK_3, -EZ2_REAL_COL_SPACING*1 }, + { TRACK_4, +EZ2_REAL_COL_SPACING*0 }, + { TRACK_5, +EZ2_REAL_COL_SPACING*1 }, + { TRACK_6, +EZ2_REAL_COL_SPACING*2 }, + { TRACK_7, +EZ2_REAL_COL_SPACING*3 }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 6, 3, 2, 4, 1, 5, Style::END_MAPPING }, + { 0, 6, 3, 2, 4, 1, 5, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 3,0,6,2,4,1,5 // This should be from back to front: Down, UpLeft, UpRight, Lower Left Hand, Lower Right Hand, Upper Left Hand, Upper Right Hand }, @@ -1637,20 +1697,24 @@ Style g_Styles[] = 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTUPLEFT, -EZ2_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_1, EZ2_BUTTON_HANDUPLEFT, -EZ2_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTDOWN, +EZ2_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_1, EZ2_BUTTON_HANDUPRIGHT, +EZ2_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTUPRIGHT, +EZ2_COL_SPACING*2 }, + { TRACK_1, -EZ2_COL_SPACING*2 }, + { TRACK_2, -EZ2_COL_SPACING*1 }, + { TRACK_3, +EZ2_COL_SPACING*0 }, + { TRACK_4, +EZ2_COL_SPACING*1 }, + { TRACK_5, +EZ2_COL_SPACING*2 }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTUPLEFT, -EZ2_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_2, EZ2_BUTTON_HANDUPLEFT, -EZ2_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTDOWN, +EZ2_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_2, EZ2_BUTTON_HANDUPRIGHT, +EZ2_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTUPRIGHT, +EZ2_COL_SPACING*2 }, + { TRACK_1, -EZ2_COL_SPACING*2 }, + { TRACK_2, -EZ2_COL_SPACING*1 }, + { TRACK_3, +EZ2_COL_SPACING*0 }, + { TRACK_4, +EZ2_COL_SPACING*1 }, + { TRACK_5, +EZ2_COL_SPACING*2 }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 4, 2, 1, 3, Style::END_MAPPING }, + { 0, 4, 2, 1, 3, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 2,0,4,1,3 // This should be from back to front: Down, UpLeft, UpRight, Upper Left Hand, Upper Right Hand }, @@ -1669,24 +1733,28 @@ Style g_Styles[] = 7, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTUPLEFT, -EZ2_REAL_COL_SPACING*3 }, - { TRACK_2, GAME_CONTROLLER_1, EZ2_BUTTON_HANDLRLEFT, -EZ2_REAL_COL_SPACING*2 }, - { TRACK_3, GAME_CONTROLLER_1, EZ2_BUTTON_HANDUPLEFT, -EZ2_REAL_COL_SPACING*1 }, - { TRACK_4, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTDOWN, +EZ2_REAL_COL_SPACING*0 }, - { TRACK_5, GAME_CONTROLLER_1, EZ2_BUTTON_HANDUPRIGHT, +EZ2_REAL_COL_SPACING*1 }, - { TRACK_6, GAME_CONTROLLER_1, EZ2_BUTTON_HANDLRRIGHT, +EZ2_REAL_COL_SPACING*2 }, - { TRACK_7, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTUPRIGHT, +EZ2_REAL_COL_SPACING*3 }, + { TRACK_1, -EZ2_REAL_COL_SPACING*3 }, + { TRACK_2, -EZ2_REAL_COL_SPACING*2 }, + { TRACK_3, -EZ2_REAL_COL_SPACING*1 }, + { TRACK_4, +EZ2_REAL_COL_SPACING*0 }, + { TRACK_5, +EZ2_REAL_COL_SPACING*1 }, + { TRACK_6, +EZ2_REAL_COL_SPACING*2 }, + { TRACK_7, +EZ2_REAL_COL_SPACING*3 }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTUPLEFT, -EZ2_REAL_COL_SPACING*3 }, - { TRACK_2, GAME_CONTROLLER_2, EZ2_BUTTON_HANDLRLEFT, -EZ2_REAL_COL_SPACING*2 }, - { TRACK_3, GAME_CONTROLLER_2, EZ2_BUTTON_HANDUPLEFT, -EZ2_REAL_COL_SPACING*1 }, - { TRACK_4, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTDOWN, +EZ2_REAL_COL_SPACING*0 }, - { TRACK_5, GAME_CONTROLLER_2, EZ2_BUTTON_HANDUPRIGHT, +EZ2_REAL_COL_SPACING*1 }, - { TRACK_6, GAME_CONTROLLER_2, EZ2_BUTTON_HANDLRRIGHT, +EZ2_REAL_COL_SPACING*2 }, - { TRACK_7, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTUPRIGHT, +EZ2_REAL_COL_SPACING*3 }, + { TRACK_1, -EZ2_REAL_COL_SPACING*3 }, + { TRACK_2, -EZ2_REAL_COL_SPACING*2 }, + { TRACK_3, -EZ2_REAL_COL_SPACING*1 }, + { TRACK_4, +EZ2_REAL_COL_SPACING*0 }, + { TRACK_5, +EZ2_REAL_COL_SPACING*1 }, + { TRACK_6, +EZ2_REAL_COL_SPACING*2 }, + { TRACK_7, +EZ2_REAL_COL_SPACING*3 }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 6, 3, 2, 4, 1, 5, Style::END_MAPPING }, + { 0, 6, 3, 2, 4, 1, 5, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 3,0,6,2,4,1,5 // This should be from back to front: Down, UpLeft, UpRight, Lower Left Hand, Lower Right Hand, Upper Left Hand, Upper Right Hand }, @@ -1705,30 +1773,34 @@ Style g_Styles[] = 10, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTUPLEFT, -EZ2_COL_SPACING*4.5f }, - { TRACK_2, GAME_CONTROLLER_1, EZ2_BUTTON_HANDUPLEFT, -EZ2_COL_SPACING*3.5f }, - { TRACK_3, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTDOWN, -EZ2_COL_SPACING*2.5f }, - { TRACK_4, GAME_CONTROLLER_1, EZ2_BUTTON_HANDUPRIGHT, -EZ2_COL_SPACING*1.5f }, - { TRACK_5, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTUPRIGHT, -EZ2_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTUPLEFT, +EZ2_COL_SPACING*0.5f }, - { TRACK_7, GAME_CONTROLLER_2, EZ2_BUTTON_HANDUPLEFT, +EZ2_COL_SPACING*1.5f }, - { TRACK_8, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTDOWN, +EZ2_COL_SPACING*2.5f }, - { TRACK_9, GAME_CONTROLLER_2, EZ2_BUTTON_HANDUPRIGHT, +EZ2_COL_SPACING*3.5f }, - { TRACK_10, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTUPRIGHT, +EZ2_COL_SPACING*4.5f }, + { TRACK_1, -EZ2_COL_SPACING*4.5f }, + { TRACK_2, -EZ2_COL_SPACING*3.5f }, + { TRACK_3, -EZ2_COL_SPACING*2.5f }, + { TRACK_4, -EZ2_COL_SPACING*1.5f }, + { TRACK_5, -EZ2_COL_SPACING*0.5f }, + { TRACK_6, +EZ2_COL_SPACING*0.5f }, + { TRACK_7, +EZ2_COL_SPACING*1.5f }, + { TRACK_8, +EZ2_COL_SPACING*2.5f }, + { TRACK_9, +EZ2_COL_SPACING*3.5f }, + { TRACK_10, +EZ2_COL_SPACING*4.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTUPLEFT, -EZ2_COL_SPACING*4.5f }, - { TRACK_2, GAME_CONTROLLER_1, EZ2_BUTTON_HANDUPLEFT, -EZ2_COL_SPACING*3.5f }, - { TRACK_3, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTDOWN, -EZ2_COL_SPACING*2.5f }, - { TRACK_4, GAME_CONTROLLER_1, EZ2_BUTTON_HANDUPRIGHT, -EZ2_COL_SPACING*1.5f }, - { TRACK_5, GAME_CONTROLLER_1, EZ2_BUTTON_FOOTUPRIGHT, -EZ2_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTUPLEFT, +EZ2_COL_SPACING*0.5f }, - { TRACK_7, GAME_CONTROLLER_2, EZ2_BUTTON_HANDUPLEFT, +EZ2_COL_SPACING*1.5f }, - { TRACK_8, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTDOWN, +EZ2_COL_SPACING*2.5f }, - { TRACK_9, GAME_CONTROLLER_2, EZ2_BUTTON_HANDUPRIGHT, +EZ2_COL_SPACING*3.5f }, - { TRACK_10, GAME_CONTROLLER_2, EZ2_BUTTON_FOOTUPRIGHT, +EZ2_COL_SPACING*4.5f }, + { TRACK_1, -EZ2_COL_SPACING*4.5f }, + { TRACK_2, -EZ2_COL_SPACING*3.5f }, + { TRACK_3, -EZ2_COL_SPACING*2.5f }, + { TRACK_4, -EZ2_COL_SPACING*1.5f }, + { TRACK_5, -EZ2_COL_SPACING*0.5f }, + { TRACK_6, +EZ2_COL_SPACING*0.5f }, + { TRACK_7, +EZ2_COL_SPACING*1.5f }, + { TRACK_8, +EZ2_COL_SPACING*2.5f }, + { TRACK_9, +EZ2_COL_SPACING*3.5f }, + { TRACK_10, +EZ2_COL_SPACING*4.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 4, 2, 1, 3, 5, 9, 7, 6, 8, Style::END_MAPPING }, + { 0, 4, 2, 1, 3, 5, 9, 7, 6, 8, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 2,0,4,1,3,7,5,9,6,8 // This should be from back to front: Down, UpLeft, UpRight, Upper Left Hand, Upper Right Hand }, @@ -1747,20 +1819,24 @@ Style g_Styles[] = 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, PARA_BUTTON_LEFT, -PARA_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_1, PARA_BUTTON_UPLEFT, -PARA_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_1, PARA_BUTTON_UP, +PARA_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_1, PARA_BUTTON_UPRIGHT, +PARA_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_1, PARA_BUTTON_RIGHT, +PARA_COL_SPACING*2 }, + { TRACK_1, -PARA_COL_SPACING*2 }, + { TRACK_2, -PARA_COL_SPACING*1 }, + { TRACK_3, +PARA_COL_SPACING*0 }, + { TRACK_4, +PARA_COL_SPACING*1 }, + { TRACK_5, +PARA_COL_SPACING*2 }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, PARA_BUTTON_LEFT, -PARA_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_2, PARA_BUTTON_UPLEFT, -PARA_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_2, PARA_BUTTON_UP, +PARA_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_2, PARA_BUTTON_UPRIGHT, +PARA_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_2, PARA_BUTTON_RIGHT, +PARA_COL_SPACING*2 }, + { TRACK_1, -PARA_COL_SPACING*2 }, + { TRACK_2, -PARA_COL_SPACING*1 }, + { TRACK_3, +PARA_COL_SPACING*0 }, + { TRACK_4, +PARA_COL_SPACING*1 }, + { TRACK_5, +PARA_COL_SPACING*2 }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 1, 2, 3, 4, Style::END_MAPPING }, + { 0, 1, 2, 3, 4, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 2,0,4,1,3 }, @@ -1779,20 +1855,24 @@ Style g_Styles[] = 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, PARA_BUTTON_LEFT, -PARA_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_1, PARA_BUTTON_UPLEFT, -PARA_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_1, PARA_BUTTON_UP, +PARA_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_1, PARA_BUTTON_UPRIGHT, +PARA_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_1, PARA_BUTTON_RIGHT, +PARA_COL_SPACING*2 }, + { TRACK_1, -PARA_COL_SPACING*2 }, + { TRACK_2, -PARA_COL_SPACING*1 }, + { TRACK_3, +PARA_COL_SPACING*0 }, + { TRACK_4, +PARA_COL_SPACING*1 }, + { TRACK_5, +PARA_COL_SPACING*2 }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, PARA_BUTTON_LEFT, -PARA_COL_SPACING*2 }, - { TRACK_2, GAME_CONTROLLER_2, PARA_BUTTON_UPLEFT, -PARA_COL_SPACING*1 }, - { TRACK_3, GAME_CONTROLLER_2, PARA_BUTTON_UP, +PARA_COL_SPACING*0 }, - { TRACK_4, GAME_CONTROLLER_2, PARA_BUTTON_UPRIGHT, +PARA_COL_SPACING*1 }, - { TRACK_5, GAME_CONTROLLER_2, PARA_BUTTON_RIGHT, +PARA_COL_SPACING*2 }, + { TRACK_1, -PARA_COL_SPACING*2 }, + { TRACK_2, -PARA_COL_SPACING*1 }, + { TRACK_3, +PARA_COL_SPACING*0 }, + { TRACK_4, +PARA_COL_SPACING*1 }, + { TRACK_5, +PARA_COL_SPACING*2 }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 1, 2, 3, 4, Style::END_MAPPING }, + { 0, 1, 2, 3, 4, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 2,0,4,1,3 }, @@ -1811,26 +1891,30 @@ Style g_Styles[] = 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, DS3DDX_BUTTON_HANDLEFT, -DS3DDX_COL_SPACING*3 }, - { TRACK_2, GAME_CONTROLLER_1, DS3DDX_BUTTON_FOOTDOWNLEFT, -DS3DDX_COL_SPACING*2 }, - { TRACK_3, GAME_CONTROLLER_1, DS3DDX_BUTTON_FOOTUPLEFT, -DS3DDX_COL_SPACING*1 }, - { TRACK_4, GAME_CONTROLLER_1, DS3DDX_BUTTON_HANDUP, -DS3DDX_COL_SPACING*0 }, - { TRACK_5, GAME_CONTROLLER_1, DS3DDX_BUTTON_HANDDOWN, +DS3DDX_COL_SPACING*0 }, - { TRACK_6, GAME_CONTROLLER_1, DS3DDX_BUTTON_FOOTUPRIGHT, +DS3DDX_COL_SPACING*1 }, - { TRACK_7, GAME_CONTROLLER_1, DS3DDX_BUTTON_FOOTDOWNRIGHT, +DS3DDX_COL_SPACING*2 }, - { TRACK_8, GAME_CONTROLLER_1, DS3DDX_BUTTON_HANDRIGHT, +DS3DDX_COL_SPACING*3 }, + { TRACK_1, -DS3DDX_COL_SPACING*3 }, + { TRACK_2, -DS3DDX_COL_SPACING*2 }, + { TRACK_3, -DS3DDX_COL_SPACING*1 }, + { TRACK_4, -DS3DDX_COL_SPACING*0 }, + { TRACK_5, +DS3DDX_COL_SPACING*0 }, + { TRACK_6, +DS3DDX_COL_SPACING*1 }, + { TRACK_7, +DS3DDX_COL_SPACING*2 }, + { TRACK_8, +DS3DDX_COL_SPACING*3 }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, DS3DDX_BUTTON_HANDLEFT, -DS3DDX_COL_SPACING*3 }, - { TRACK_2, GAME_CONTROLLER_2, DS3DDX_BUTTON_FOOTDOWNLEFT, -DS3DDX_COL_SPACING*2 }, - { TRACK_3, GAME_CONTROLLER_2, DS3DDX_BUTTON_FOOTUPLEFT, -DS3DDX_COL_SPACING*1 }, - { TRACK_4, GAME_CONTROLLER_2, DS3DDX_BUTTON_HANDUP, -DS3DDX_COL_SPACING*0 }, - { TRACK_5, GAME_CONTROLLER_2, DS3DDX_BUTTON_HANDDOWN, +DS3DDX_COL_SPACING*0 }, - { TRACK_6, GAME_CONTROLLER_2, DS3DDX_BUTTON_FOOTUPRIGHT, +DS3DDX_COL_SPACING*1 }, - { TRACK_7, GAME_CONTROLLER_2, DS3DDX_BUTTON_FOOTDOWNRIGHT, +DS3DDX_COL_SPACING*2 }, - { TRACK_8, GAME_CONTROLLER_2, DS3DDX_BUTTON_HANDRIGHT, +DS3DDX_COL_SPACING*3 }, + { TRACK_1, -DS3DDX_COL_SPACING*3 }, + { TRACK_2, -DS3DDX_COL_SPACING*2 }, + { TRACK_3, -DS3DDX_COL_SPACING*1 }, + { TRACK_4, -DS3DDX_COL_SPACING*0 }, + { TRACK_5, +DS3DDX_COL_SPACING*0 }, + { TRACK_6, +DS3DDX_COL_SPACING*1 }, + { TRACK_7, +DS3DDX_COL_SPACING*2 }, + { TRACK_8, +DS3DDX_COL_SPACING*3 }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 1, 2, 3, 4, 5, 6, 7, Style::END_MAPPING }, + { 0, 1, 2, 3, 4, 5, 6, 7, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7 }, @@ -1849,22 +1933,26 @@ Style g_Styles[] = 6, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, BM_BUTTON_KEY1, -BM_COL_SPACING*2.5f }, - { TRACK_2, GAME_CONTROLLER_1, BM_BUTTON_KEY2, -BM_COL_SPACING*1.5f }, - { TRACK_3, GAME_CONTROLLER_1, BM_BUTTON_KEY3, -BM_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_1, BM_BUTTON_KEY4, +BM_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_1, BM_BUTTON_KEY5, +BM_COL_SPACING*1.5f }, - { TRACK_6, GAME_CONTROLLER_1, BM_BUTTON_SCRATCHUP,+BM_COL_SPACING*3.0f }, + { TRACK_1, -BM_COL_SPACING*2.5f }, + { TRACK_2, -BM_COL_SPACING*1.5f }, + { TRACK_3, -BM_COL_SPACING*0.5f }, + { TRACK_4, +BM_COL_SPACING*0.5f }, + { TRACK_5, +BM_COL_SPACING*1.5f }, + { TRACK_6, +BM_COL_SPACING*3.0f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, BM_BUTTON_KEY1, -BM_COL_SPACING*2.5f }, - { TRACK_2, GAME_CONTROLLER_2, BM_BUTTON_KEY2, -BM_COL_SPACING*1.5f }, - { TRACK_3, GAME_CONTROLLER_2, BM_BUTTON_KEY3, -BM_COL_SPACING*0.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*1.5f }, - { TRACK_6, GAME_CONTROLLER_2, BM_BUTTON_SCRATCHUP,+BM_COL_SPACING*3.0f }, + { TRACK_1, -BM_COL_SPACING*2.5f }, + { TRACK_2, -BM_COL_SPACING*1.5f }, + { TRACK_3, -BM_COL_SPACING*0.5f }, + { TRACK_4, +BM_COL_SPACING*0.5f }, + { TRACK_5, +BM_COL_SPACING*1.5f }, + { TRACK_6, +BM_COL_SPACING*3.0f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 1, 2, 3, 4, Style::NO_MAPPING, Style::NO_MAPPING, 5, 5, Style::END_MAPPING }, + { 0, 1, 2, 3, 4, Style::NO_MAPPING, Style::NO_MAPPING, 5, 5, Style::END_MAPPING } + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5 }, @@ -1883,34 +1971,38 @@ Style g_Styles[] = 12, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, BM_BUTTON_KEY1, -BM_COL_SPACING*6.0f }, - { TRACK_2, GAME_CONTROLLER_1, BM_BUTTON_KEY2, -BM_COL_SPACING*5.0f }, - { TRACK_3, GAME_CONTROLLER_1, BM_BUTTON_KEY3, -BM_COL_SPACING*4.0f }, - { TRACK_4, GAME_CONTROLLER_1, BM_BUTTON_KEY4, -BM_COL_SPACING*3.0f }, - { TRACK_5, GAME_CONTROLLER_1, BM_BUTTON_KEY5, -BM_COL_SPACING*2.0f }, - { TRACK_6, GAME_CONTROLLER_1, BM_BUTTON_SCRATCHUP,-BM_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_2, BM_BUTTON_KEY1, +BM_COL_SPACING*0.5f }, - { TRACK_8, GAME_CONTROLLER_2, BM_BUTTON_KEY2, +BM_COL_SPACING*1.5f }, - { TRACK_9, GAME_CONTROLLER_2, BM_BUTTON_KEY3, +BM_COL_SPACING*2.5f }, - { TRACK_10, GAME_CONTROLLER_2, BM_BUTTON_KEY4, +BM_COL_SPACING*3.5f }, - { TRACK_11, GAME_CONTROLLER_2, BM_BUTTON_KEY5, +BM_COL_SPACING*4.5f }, - { TRACK_12, GAME_CONTROLLER_2, BM_BUTTON_SCRATCHUP,+BM_COL_SPACING*6.0f }, + { TRACK_1, -BM_COL_SPACING*6.0f }, + { TRACK_2, -BM_COL_SPACING*5.0f }, + { TRACK_3, -BM_COL_SPACING*4.0f }, + { TRACK_4, -BM_COL_SPACING*3.0f }, + { TRACK_5, -BM_COL_SPACING*2.0f }, + { TRACK_6, -BM_COL_SPACING*1.5f }, + { TRACK_7, +BM_COL_SPACING*0.5f }, + { TRACK_8, +BM_COL_SPACING*1.5f }, + { TRACK_9, +BM_COL_SPACING*2.5f }, + { TRACK_10, +BM_COL_SPACING*3.5f }, + { TRACK_11, +BM_COL_SPACING*4.5f }, + { TRACK_12, +BM_COL_SPACING*6.0f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_1, BM_BUTTON_KEY1, -BM_COL_SPACING*6.0f }, - { TRACK_2, GAME_CONTROLLER_1, BM_BUTTON_KEY2, -BM_COL_SPACING*5.0f }, - { TRACK_3, GAME_CONTROLLER_1, BM_BUTTON_KEY3, -BM_COL_SPACING*4.0f }, - { TRACK_4, GAME_CONTROLLER_1, BM_BUTTON_KEY4, -BM_COL_SPACING*3.0f }, - { TRACK_5, GAME_CONTROLLER_1, BM_BUTTON_KEY5, -BM_COL_SPACING*2.0f }, - { TRACK_6, GAME_CONTROLLER_1, BM_BUTTON_SCRATCHUP,-BM_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_2, BM_BUTTON_KEY1, +BM_COL_SPACING*0.5f }, - { TRACK_8, GAME_CONTROLLER_2, BM_BUTTON_KEY2, +BM_COL_SPACING*1.5f }, - { TRACK_9, GAME_CONTROLLER_2, BM_BUTTON_KEY3, +BM_COL_SPACING*2.5f }, - { TRACK_10, GAME_CONTROLLER_2, BM_BUTTON_KEY4, +BM_COL_SPACING*3.5f }, - { TRACK_11, GAME_CONTROLLER_2, BM_BUTTON_KEY5, +BM_COL_SPACING*4.5f }, - { TRACK_12, GAME_CONTROLLER_2, BM_BUTTON_SCRATCHUP,+BM_COL_SPACING*6.0f }, + { TRACK_1, -BM_COL_SPACING*6.0f }, + { TRACK_2, -BM_COL_SPACING*5.0f }, + { TRACK_3, -BM_COL_SPACING*4.0f }, + { TRACK_4, -BM_COL_SPACING*3.0f }, + { TRACK_5, -BM_COL_SPACING*2.0f }, + { TRACK_6, -BM_COL_SPACING*1.5f }, + { TRACK_7, +BM_COL_SPACING*0.5f }, + { TRACK_8, +BM_COL_SPACING*1.5f }, + { TRACK_9, +BM_COL_SPACING*2.5f }, + { TRACK_10, +BM_COL_SPACING*3.5f }, + { TRACK_11, +BM_COL_SPACING*4.5f }, + { TRACK_12, +BM_COL_SPACING*6.0f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 1, 2, 3, 4, Style::NO_MAPPING, Style::NO_MAPPING, 5, 5, Style::END_MAPPING }, + { 5, 6, 7, 8, 9, Style::NO_MAPPING, Style::NO_MAPPING, 10, 10, Style::END_MAPPING } + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7,8,9,10,11 }, @@ -1929,26 +2021,30 @@ Style g_Styles[] = 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { 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 }, + { TRACK_8, -BM_COL_SPACING*3.5f }, + { TRACK_1, -BM_COL_SPACING*2.0f }, + { TRACK_2, -BM_COL_SPACING*1.0f }, + { TRACK_3, -BM_COL_SPACING*0.0f }, + { TRACK_4, +BM_COL_SPACING*1.0f }, + { TRACK_5, +BM_COL_SPACING*2.0f }, + { TRACK_6, +BM_COL_SPACING*3.0f }, + { TRACK_7, +BM_COL_SPACING*4.0f }, }, { // PLAYER_2 - { 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 }, + { TRACK_1, -BM_COL_SPACING*3.5f }, + { TRACK_2, -BM_COL_SPACING*2.5f }, + { TRACK_3, -BM_COL_SPACING*1.5f }, + { TRACK_4, -BM_COL_SPACING*0.5f }, + { TRACK_5, +BM_COL_SPACING*0.5f }, + { TRACK_6, +BM_COL_SPACING*1.5f }, + { TRACK_7, +BM_COL_SPACING*2.5f }, + { TRACK_8, +BM_COL_SPACING*4.0f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 1, 2, 3, 4, 5, 6, 7, 0, 0, Style::END_MAPPING }, + { 0, 1, 2, 3, 4, 5, 6, 7, 7, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7 }, @@ -1967,42 +2063,46 @@ Style g_Styles[] = 16, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { 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 }, + { TRACK_8, -BM_COL_SPACING*8.0f }, + { TRACK_1, -BM_COL_SPACING*6.5f }, + { TRACK_2, -BM_COL_SPACING*5.5f }, + { TRACK_3, -BM_COL_SPACING*4.5f }, + { TRACK_4, -BM_COL_SPACING*3.5f }, + { TRACK_5, -BM_COL_SPACING*2.5f }, + { TRACK_6, -BM_COL_SPACING*1.5f }, + { TRACK_7, -BM_COL_SPACING*0.5f }, + { TRACK_9, +BM_COL_SPACING*0.5f }, + { TRACK_10, +BM_COL_SPACING*1.5f }, + { TRACK_11, +BM_COL_SPACING*2.5f }, + { TRACK_12, +BM_COL_SPACING*3.5f }, + { TRACK_13, +BM_COL_SPACING*4.5f }, + { TRACK_14, +BM_COL_SPACING*5.5f }, + { TRACK_15, +BM_COL_SPACING*6.5f }, + { TRACK_16, +BM_COL_SPACING*8.0f }, }, { // PLAYER_2 - { 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 }, + { TRACK_8, -BM_COL_SPACING*8.0f }, + { TRACK_1, -BM_COL_SPACING*6.5f }, + { TRACK_2, -BM_COL_SPACING*5.5f }, + { TRACK_3, -BM_COL_SPACING*4.5f }, + { TRACK_4, -BM_COL_SPACING*3.5f }, + { TRACK_5, -BM_COL_SPACING*2.5f }, + { TRACK_6, -BM_COL_SPACING*1.5f }, + { TRACK_7, -BM_COL_SPACING*0.5f }, + { TRACK_9, +BM_COL_SPACING*0.5f }, + { TRACK_10, +BM_COL_SPACING*1.5f }, + { TRACK_11, +BM_COL_SPACING*2.5f }, + { TRACK_12, +BM_COL_SPACING*3.5f }, + { TRACK_13, +BM_COL_SPACING*4.5f }, + { TRACK_14, +BM_COL_SPACING*5.5f }, + { TRACK_15, +BM_COL_SPACING*6.5f }, + { TRACK_16, +BM_COL_SPACING*8.0f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 1, 2, 3, 4, 5, 6, 7, 0, 0, Style::END_MAPPING }, + { 8, 9, 10, 11, 12, 13, 14, 15, 15, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 }, @@ -2021,18 +2121,22 @@ Style g_Styles[] = 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDLRLEFT, -MANIAX_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDUPLEFT, -MANIAX_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDUPRIGHT, +MANIAX_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDLRRIGHT, +MANIAX_COL_SPACING*1.5f }, + { TRACK_1, -MANIAX_COL_SPACING*1.5f }, + { TRACK_2, -MANIAX_COL_SPACING*0.5f }, + { TRACK_3, +MANIAX_COL_SPACING*0.5f }, + { TRACK_4, +MANIAX_COL_SPACING*1.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDLRLEFT, -MANIAX_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDUPLEFT, -MANIAX_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDUPRIGHT, +MANIAX_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDLRRIGHT, +MANIAX_COL_SPACING*1.5f }, + { TRACK_1, -MANIAX_COL_SPACING*1.5f }, + { TRACK_2, -MANIAX_COL_SPACING*0.5f }, + { TRACK_3, +MANIAX_COL_SPACING*0.5f }, + { TRACK_4, +MANIAX_COL_SPACING*1.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 1, 2, 0, 3, Style::END_MAPPING }, + { 1, 2, 0, 3, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0, 1, 2, 3 }, @@ -2051,18 +2155,22 @@ Style g_Styles[] = 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDLRLEFT, -MANIAX_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDUPLEFT, -MANIAX_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDUPRIGHT, +MANIAX_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDLRRIGHT, +MANIAX_COL_SPACING*1.5f }, + { TRACK_1, -MANIAX_COL_SPACING*1.5f }, + { TRACK_2, -MANIAX_COL_SPACING*0.5f }, + { TRACK_3, +MANIAX_COL_SPACING*0.5f }, + { TRACK_4, +MANIAX_COL_SPACING*1.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDLRLEFT, -MANIAX_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDUPLEFT, -MANIAX_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDUPRIGHT, +MANIAX_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDLRRIGHT, +MANIAX_COL_SPACING*1.5f }, + { TRACK_1, -MANIAX_COL_SPACING*1.5f }, + { TRACK_2, -MANIAX_COL_SPACING*0.5f }, + { TRACK_3, +MANIAX_COL_SPACING*0.5f }, + { TRACK_4, +MANIAX_COL_SPACING*1.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 1, 2, 0, 3, Style::END_MAPPING }, + { 1, 2, 0, 3, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0, 1, 2, 3 }, @@ -2081,26 +2189,30 @@ Style g_Styles[] = 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDLRLEFT, -MANIAX_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDUPLEFT, -MANIAX_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDUPRIGHT, -MANIAX_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDLRRIGHT, -MANIAX_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDLRLEFT, +MANIAX_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDUPLEFT, +MANIAX_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDUPRIGHT, +MANIAX_COL_SPACING*2.5f }, - { TRACK_8, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDLRRIGHT, +MANIAX_COL_SPACING*3.5f }, + { TRACK_1, -MANIAX_COL_SPACING*3.5f }, + { TRACK_2, -MANIAX_COL_SPACING*2.5f }, + { TRACK_3, -MANIAX_COL_SPACING*1.5f }, + { TRACK_4, -MANIAX_COL_SPACING*0.5f }, + { TRACK_5, +MANIAX_COL_SPACING*0.5f }, + { TRACK_6, +MANIAX_COL_SPACING*1.5f }, + { TRACK_7, +MANIAX_COL_SPACING*2.5f }, + { TRACK_8, +MANIAX_COL_SPACING*3.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDLRLEFT, -MANIAX_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDUPLEFT, -MANIAX_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDUPRIGHT, -MANIAX_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_1, MANIAX_BUTTON_HANDLRRIGHT, -MANIAX_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDLRLEFT, +MANIAX_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDUPLEFT, +MANIAX_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDUPRIGHT, +MANIAX_COL_SPACING*2.5f }, - { TRACK_8, GAME_CONTROLLER_2, MANIAX_BUTTON_HANDLRRIGHT, +MANIAX_COL_SPACING*3.5f }, + { TRACK_1, -MANIAX_COL_SPACING*3.5f }, + { TRACK_2, -MANIAX_COL_SPACING*2.5f }, + { TRACK_3, -MANIAX_COL_SPACING*1.5f }, + { TRACK_4, -MANIAX_COL_SPACING*0.5f }, + { TRACK_5, +MANIAX_COL_SPACING*0.5f }, + { TRACK_6, +MANIAX_COL_SPACING*1.5f }, + { TRACK_7, +MANIAX_COL_SPACING*2.5f }, + { TRACK_8, +MANIAX_COL_SPACING*3.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 1, 2, 0, 3, 5, 6, 4, 7, Style::END_MAPPING }, + { 1, 2, 0, 3, 5, 6, 4, 7, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7 }, @@ -2119,18 +2231,22 @@ Style g_Styles[] = 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_UP, TECHNO_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_RIGHT, TECHNO_COL_SPACING*1.5f }, + { TRACK_1, -TECHNO_COL_SPACING*1.5f }, + { TRACK_2, -TECHNO_COL_SPACING*0.5f }, + { TRACK_3, +TECHNO_COL_SPACING*0.5f }, + { TRACK_4, +TECHNO_COL_SPACING*1.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_2, TECHNO_BUTTON_UP, TECHNO_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_2, TECHNO_BUTTON_RIGHT, TECHNO_COL_SPACING*1.5f }, + { TRACK_1, -TECHNO_COL_SPACING*1.5f }, + { TRACK_2, -TECHNO_COL_SPACING*0.5f }, + { TRACK_3, +TECHNO_COL_SPACING*0.5f }, + { TRACK_4, +TECHNO_COL_SPACING*1.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 3, 2, 1, Style::END_MAPPING }, + { 0, 3, 2, 1, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3 }, @@ -2149,20 +2265,26 @@ Style g_Styles[] = 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*2.0f }, - { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*1.0f }, - { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_CENTER, TECHNO_COL_SPACING*0.0f }, - { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*1.0f }, - { TRACK_5, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNRIGHT,+TECHNO_COL_SPACING*2.0f }, + { TRACK_1, -TECHNO_COL_SPACING*2.0f }, + { TRACK_2, -TECHNO_COL_SPACING*1.0f }, + { TRACK_3, +TECHNO_COL_SPACING*0.0f }, + { TRACK_4, +TECHNO_COL_SPACING*1.0f }, + { TRACK_5, +TECHNO_COL_SPACING*2.0f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*2.0f }, - { TRACK_2, GAME_CONTROLLER_2, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*1.0f }, - { TRACK_3, GAME_CONTROLLER_2, TECHNO_BUTTON_CENTER, TECHNO_COL_SPACING*0.0f }, - { TRACK_4, GAME_CONTROLLER_2, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*1.0f }, - { TRACK_5, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNRIGHT,+TECHNO_COL_SPACING*2.0f }, + { TRACK_1, -TECHNO_COL_SPACING*2.0f }, + { TRACK_2, -TECHNO_COL_SPACING*1.0f }, + { TRACK_3, +TECHNO_COL_SPACING*0.0f }, + { TRACK_4, +TECHNO_COL_SPACING*1.0f }, + { TRACK_5, +TECHNO_COL_SPACING*2.0f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, + 1, 3, 2, 0, 4, Style::END_MAPPING }, + { Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, + 1, 3, 2, 0, 4, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4 }, @@ -2181,26 +2303,30 @@ Style g_Styles[] = 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_1, TECHNO_BUTTON_UP, +TECHNO_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_1, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_1, TECHNO_BUTTON_RIGHT, +TECHNO_COL_SPACING*2.5f }, - { TRACK_8, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNRIGHT,+TECHNO_COL_SPACING*3.5f }, + { TRACK_1, -TECHNO_COL_SPACING*3.5f }, + { TRACK_2, -TECHNO_COL_SPACING*2.5f }, + { TRACK_3, -TECHNO_COL_SPACING*1.5f }, + { TRACK_4, -TECHNO_COL_SPACING*0.5f }, + { TRACK_5, +TECHNO_COL_SPACING*0.5f }, + { TRACK_6, +TECHNO_COL_SPACING*1.5f }, + { TRACK_7, +TECHNO_COL_SPACING*2.5f }, + { TRACK_8, +TECHNO_COL_SPACING*3.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_2, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_2, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, TECHNO_BUTTON_UP, +TECHNO_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_2, TECHNO_BUTTON_RIGHT, +TECHNO_COL_SPACING*2.5f }, - { TRACK_8, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNRIGHT,+TECHNO_COL_SPACING*3.5f }, + { TRACK_1, -TECHNO_COL_SPACING*3.5f }, + { TRACK_2, -TECHNO_COL_SPACING*2.5f }, + { TRACK_3, -TECHNO_COL_SPACING*1.5f }, + { TRACK_4, -TECHNO_COL_SPACING*0.5f }, + { TRACK_5, +TECHNO_COL_SPACING*0.5f }, + { TRACK_6, +TECHNO_COL_SPACING*1.5f }, + { TRACK_7, +TECHNO_COL_SPACING*2.5f }, + { TRACK_8, +TECHNO_COL_SPACING*3.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 1, 6, 4, Style::NO_MAPPING, 2, 5, Style::NO_MAPPING, 0, 7, Style::END_MAPPING }, + { 1, 6, 4, Style::NO_MAPPING, 2, 5, Style::NO_MAPPING, 0, 7, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7 }, @@ -2219,18 +2345,22 @@ Style g_Styles[] = 4, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_UP, TECHNO_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_RIGHT, TECHNO_COL_SPACING*1.5f }, + { TRACK_1, -TECHNO_COL_SPACING*1.5f }, + { TRACK_2, -TECHNO_COL_SPACING*0.5f }, + { TRACK_3, +TECHNO_COL_SPACING*0.5f }, + { TRACK_4, TECHNO_COL_SPACING*1.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*1.5f }, - { TRACK_2, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*0.5f }, - { TRACK_3, GAME_CONTROLLER_2, TECHNO_BUTTON_UP, TECHNO_COL_SPACING*0.5f }, - { TRACK_4, GAME_CONTROLLER_2, TECHNO_BUTTON_RIGHT, TECHNO_COL_SPACING*1.5f }, + { TRACK_1, -TECHNO_COL_SPACING*1.5f }, + { TRACK_2, -TECHNO_COL_SPACING*0.5f }, + { TRACK_3, +TECHNO_COL_SPACING*0.5f }, + { TRACK_4, +TECHNO_COL_SPACING*1.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 3, 2, 1, Style::END_MAPPING }, + { 0, 3, 2, 1, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3 }, @@ -2249,20 +2379,26 @@ Style g_Styles[] = 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*2.0f }, - { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*1.0f }, - { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_CENTER, TECHNO_COL_SPACING*0.0f }, - { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*1.0f }, - { TRACK_5, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNRIGHT,+TECHNO_COL_SPACING*2.0f }, + { TRACK_1, -TECHNO_COL_SPACING*2.0f }, + { TRACK_2, -TECHNO_COL_SPACING*1.0f }, + { TRACK_3, +TECHNO_COL_SPACING*0.0f }, + { TRACK_4, +TECHNO_COL_SPACING*1.0f }, + { TRACK_5, +TECHNO_COL_SPACING*2.0f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*2.0f }, - { TRACK_2, GAME_CONTROLLER_2, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*1.0f }, - { TRACK_3, GAME_CONTROLLER_2, TECHNO_BUTTON_CENTER, TECHNO_COL_SPACING*0.0f }, - { TRACK_4, GAME_CONTROLLER_2, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*1.0f }, - { TRACK_5, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNRIGHT,+TECHNO_COL_SPACING*2.0f }, + { TRACK_1, -TECHNO_COL_SPACING*2.0f }, + { TRACK_2, -TECHNO_COL_SPACING*1.0f }, + { TRACK_3, +TECHNO_COL_SPACING*0.0f }, + { TRACK_4, +TECHNO_COL_SPACING*1.0f }, + { TRACK_5, +TECHNO_COL_SPACING*2.0f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, + 1, 3, 2, 0, 4, Style::END_MAPPING }, + { Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, + 1, 3, 2, 0, 4, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4 }, @@ -2281,26 +2417,30 @@ Style g_Styles[] = 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNLEFT, -TECHNO_VERSUS_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_LEFT, -TECHNO_VERSUS_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_UPLEFT, -TECHNO_VERSUS_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWN, -TECHNO_VERSUS_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_1, TECHNO_BUTTON_UP, +TECHNO_VERSUS_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_1, TECHNO_BUTTON_UPRIGHT, +TECHNO_VERSUS_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_1, TECHNO_BUTTON_RIGHT, +TECHNO_VERSUS_COL_SPACING*2.5f }, - { TRACK_8, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNRIGHT,+TECHNO_VERSUS_COL_SPACING*3.5f }, + { TRACK_1, -TECHNO_VERSUS_COL_SPACING*3.5f }, + { TRACK_2, -TECHNO_VERSUS_COL_SPACING*2.5f }, + { TRACK_3, -TECHNO_VERSUS_COL_SPACING*1.5f }, + { TRACK_4, -TECHNO_VERSUS_COL_SPACING*0.5f }, + { TRACK_5, +TECHNO_VERSUS_COL_SPACING*0.5f }, + { TRACK_6, +TECHNO_VERSUS_COL_SPACING*1.5f }, + { TRACK_7, +TECHNO_VERSUS_COL_SPACING*2.5f }, + { TRACK_8, +TECHNO_VERSUS_COL_SPACING*3.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNLEFT, -TECHNO_VERSUS_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_2, TECHNO_BUTTON_LEFT, -TECHNO_VERSUS_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_2, TECHNO_BUTTON_UPLEFT, -TECHNO_VERSUS_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWN, -TECHNO_VERSUS_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, TECHNO_BUTTON_UP, +TECHNO_VERSUS_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, TECHNO_BUTTON_UPRIGHT, +TECHNO_VERSUS_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_2, TECHNO_BUTTON_RIGHT, +TECHNO_VERSUS_COL_SPACING*2.5f }, - { TRACK_8, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNRIGHT,+TECHNO_VERSUS_COL_SPACING*3.5f }, + { TRACK_1, -TECHNO_VERSUS_COL_SPACING*3.5f }, + { TRACK_2, -TECHNO_VERSUS_COL_SPACING*2.5f }, + { TRACK_3, -TECHNO_VERSUS_COL_SPACING*1.5f }, + { TRACK_4, -TECHNO_VERSUS_COL_SPACING*0.5f }, + { TRACK_5, +TECHNO_VERSUS_COL_SPACING*0.5f }, + { TRACK_6, +TECHNO_VERSUS_COL_SPACING*1.5f }, + { TRACK_7, +TECHNO_VERSUS_COL_SPACING*2.5f }, + { TRACK_8, +TECHNO_VERSUS_COL_SPACING*3.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 1, 6, 4, Style::NO_MAPPING, 2, 5, Style::NO_MAPPING, 0, 7, Style::END_MAPPING }, + { 1, 6, 4, Style::NO_MAPPING, 2, 5, Style::NO_MAPPING, 0, 7, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7 }, @@ -2319,26 +2459,30 @@ Style g_Styles[] = 8, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_UP, -TECHNO_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_RIGHT, -TECHNO_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, TECHNO_BUTTON_LEFT, +TECHNO_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWN, +TECHNO_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_2, TECHNO_BUTTON_UP, +TECHNO_COL_SPACING*2.5f }, - { TRACK_8, GAME_CONTROLLER_2, TECHNO_BUTTON_RIGHT, +TECHNO_COL_SPACING*3.5f }, + { TRACK_1, -TECHNO_COL_SPACING*3.5f }, + { TRACK_2, -TECHNO_COL_SPACING*2.5f }, + { TRACK_3, -TECHNO_COL_SPACING*1.5f }, + { TRACK_4, -TECHNO_COL_SPACING*0.5f }, + { TRACK_5, +TECHNO_COL_SPACING*0.5f }, + { TRACK_6, +TECHNO_COL_SPACING*1.5f }, + { TRACK_7, +TECHNO_COL_SPACING*2.5f }, + { TRACK_8, +TECHNO_COL_SPACING*3.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_LEFT, -TECHNO_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWN, -TECHNO_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_UP, -TECHNO_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_RIGHT, -TECHNO_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, TECHNO_BUTTON_LEFT, +TECHNO_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWN, +TECHNO_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_2, TECHNO_BUTTON_UP, +TECHNO_COL_SPACING*2.5f }, - { TRACK_8, GAME_CONTROLLER_2, TECHNO_BUTTON_RIGHT, +TECHNO_COL_SPACING*3.5f }, + { TRACK_1, -TECHNO_COL_SPACING*3.5f }, + { TRACK_2, -TECHNO_COL_SPACING*2.5f }, + { TRACK_3, -TECHNO_COL_SPACING*1.5f }, + { TRACK_4, -TECHNO_COL_SPACING*0.5f }, + { TRACK_5, +TECHNO_COL_SPACING*0.5f }, + { TRACK_6, +TECHNO_COL_SPACING*1.5f }, + { TRACK_7, +TECHNO_COL_SPACING*2.5f }, + { TRACK_8, +TECHNO_COL_SPACING*3.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 3, 2, 1, Style::END_MAPPING }, + { 4, 7, 6, 5, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7 }, @@ -2357,30 +2501,36 @@ Style g_Styles[] = 10, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*4.5f }, - { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*3.5f }, - { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_CENTER, -TECHNO_COL_SPACING*2.5f }, - { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_UPRIGHT, -TECHNO_COL_SPACING*1.5f }, - { TRACK_5, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNRIGHT, -TECHNO_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNLEFT, +TECHNO_COL_SPACING*0.5f }, - { TRACK_7, GAME_CONTROLLER_2, TECHNO_BUTTON_UPLEFT, +TECHNO_COL_SPACING*1.5f }, - { TRACK_8, GAME_CONTROLLER_2, TECHNO_BUTTON_CENTER, +TECHNO_COL_SPACING*2.5f }, - { TRACK_9, GAME_CONTROLLER_2, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*3.5f }, - { TRACK_10, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNRIGHT, +TECHNO_COL_SPACING*4.5f }, + { TRACK_1, -TECHNO_COL_SPACING*4.5f }, + { TRACK_2, -TECHNO_COL_SPACING*3.5f }, + { TRACK_3, -TECHNO_COL_SPACING*2.5f }, + { TRACK_4, -TECHNO_COL_SPACING*1.5f }, + { TRACK_5, -TECHNO_COL_SPACING*0.5f }, + { TRACK_6, +TECHNO_COL_SPACING*0.5f }, + { TRACK_7, +TECHNO_COL_SPACING*1.5f }, + { TRACK_8, +TECHNO_COL_SPACING*2.5f }, + { TRACK_9, +TECHNO_COL_SPACING*3.5f }, + { TRACK_10, +TECHNO_COL_SPACING*4.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNLEFT, -TECHNO_COL_SPACING*4.5f }, - { TRACK_2, GAME_CONTROLLER_1, TECHNO_BUTTON_UPLEFT, -TECHNO_COL_SPACING*3.5f }, - { TRACK_3, GAME_CONTROLLER_1, TECHNO_BUTTON_CENTER, -TECHNO_COL_SPACING*2.5f }, - { TRACK_4, GAME_CONTROLLER_1, TECHNO_BUTTON_UPRIGHT, -TECHNO_COL_SPACING*1.5f }, - { TRACK_5, GAME_CONTROLLER_1, TECHNO_BUTTON_DOWNRIGHT, -TECHNO_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNLEFT, +TECHNO_COL_SPACING*0.5f }, - { TRACK_7, GAME_CONTROLLER_2, TECHNO_BUTTON_UPLEFT, +TECHNO_COL_SPACING*1.5f }, - { TRACK_8, GAME_CONTROLLER_2, TECHNO_BUTTON_CENTER, +TECHNO_COL_SPACING*2.5f }, - { TRACK_9, GAME_CONTROLLER_2, TECHNO_BUTTON_UPRIGHT, +TECHNO_COL_SPACING*3.5f }, - { TRACK_10, GAME_CONTROLLER_2, TECHNO_BUTTON_DOWNRIGHT, +TECHNO_COL_SPACING*4.5f }, + { TRACK_1, -TECHNO_COL_SPACING*4.5f }, + { TRACK_2, -TECHNO_COL_SPACING*3.5f }, + { TRACK_3, -TECHNO_COL_SPACING*2.5f }, + { TRACK_4, -TECHNO_COL_SPACING*1.5f }, + { TRACK_5, -TECHNO_COL_SPACING*0.5f }, + { TRACK_6, +TECHNO_COL_SPACING*0.5f }, + { TRACK_7, +TECHNO_COL_SPACING*1.5f }, + { TRACK_8, +TECHNO_COL_SPACING*2.5f }, + { TRACK_9, +TECHNO_COL_SPACING*3.5f }, + { TRACK_10, +TECHNO_COL_SPACING*4.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, + 1, 3, 2, 0, 4, Style::END_MAPPING }, + { Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, Style::NO_MAPPING, + 6, 8, 7, 5, 9, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7,8,9 }, @@ -2399,20 +2549,24 @@ Style g_Styles[] = 5, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_GREEN, -PNM5_COL_SPACING*2.0f }, - { TRACK_2, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_BLUE, -PNM5_COL_SPACING*1.0f }, - { TRACK_3, GAME_CONTROLLER_1, PNM_BUTTON_RED, -PNM5_COL_SPACING*0.0f }, - { TRACK_4, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_BLUE, +PNM5_COL_SPACING*1.0f }, - { TRACK_5, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_GREEN, +PNM5_COL_SPACING*2.0f }, + { TRACK_1, -PNM5_COL_SPACING*2.0f }, + { TRACK_2, -PNM5_COL_SPACING*1.0f }, + { TRACK_3, +PNM5_COL_SPACING*0.0f }, + { TRACK_4, +PNM5_COL_SPACING*1.0f }, + { TRACK_5, +PNM5_COL_SPACING*2.0f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_GREEN, -PNM5_COL_SPACING*2.0f }, - { TRACK_2, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_BLUE, -PNM5_COL_SPACING*1.0f }, - { TRACK_3, GAME_CONTROLLER_2, PNM_BUTTON_RED, -PNM5_COL_SPACING*0.0f }, - { TRACK_4, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_BLUE, +PNM5_COL_SPACING*1.0f }, - { TRACK_5, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_GREEN, +PNM5_COL_SPACING*2.0f }, + { TRACK_1, -PNM5_COL_SPACING*2.0f }, + { TRACK_2, -PNM5_COL_SPACING*1.0f }, + { TRACK_3, +PNM5_COL_SPACING*0.0f }, + { TRACK_4, +PNM5_COL_SPACING*1.0f }, + { TRACK_5, +PNM5_COL_SPACING*2.0f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { Style::NO_MAPPING, Style::NO_MAPPING, 0, 1, 2, 3, 4, Style::END_MAPPING }, + { Style::NO_MAPPING, Style::NO_MAPPING, 0, 1, 2, 3, 4, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4 }, @@ -2431,28 +2585,32 @@ Style g_Styles[] = 9, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_WHITE, -PNM9_COL_SPACING*4.0f }, - { TRACK_2, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_YELLOW, -PNM9_COL_SPACING*3.0f }, - { TRACK_3, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_GREEN, -PNM9_COL_SPACING*2.0f }, - { TRACK_4, GAME_CONTROLLER_1, PNM_BUTTON_LEFT_BLUE, -PNM9_COL_SPACING*1.0f }, - { TRACK_5, GAME_CONTROLLER_1, PNM_BUTTON_RED, -PNM9_COL_SPACING*0.0f }, - { TRACK_6, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_BLUE, +PNM9_COL_SPACING*1.0f }, - { TRACK_7, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_GREEN, +PNM9_COL_SPACING*2.0f }, - { TRACK_8, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_YELLOW, +PNM9_COL_SPACING*3.0f }, - { TRACK_9, GAME_CONTROLLER_1, PNM_BUTTON_RIGHT_WHITE, +PNM9_COL_SPACING*4.0f }, + { TRACK_1, -PNM9_COL_SPACING*4.0f }, + { TRACK_2, -PNM9_COL_SPACING*3.0f }, + { TRACK_3, -PNM9_COL_SPACING*2.0f }, + { TRACK_4, -PNM9_COL_SPACING*1.0f }, + { TRACK_5, +PNM9_COL_SPACING*0.0f }, + { TRACK_6, +PNM9_COL_SPACING*1.0f }, + { TRACK_7, +PNM9_COL_SPACING*2.0f }, + { TRACK_8, +PNM9_COL_SPACING*3.0f }, + { TRACK_9, +PNM9_COL_SPACING*4.0f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_WHITE, -PNM9_COL_SPACING*4.0f }, - { TRACK_2, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_YELLOW, -PNM9_COL_SPACING*3.0f }, - { TRACK_3, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_GREEN, -PNM9_COL_SPACING*2.0f }, - { TRACK_4, GAME_CONTROLLER_2, PNM_BUTTON_LEFT_BLUE, -PNM9_COL_SPACING*1.0f }, - { TRACK_5, GAME_CONTROLLER_2, PNM_BUTTON_RED, -PNM9_COL_SPACING*0.0f }, - { TRACK_6, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_BLUE, +PNM9_COL_SPACING*1.0f }, - { TRACK_7, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_GREEN, +PNM9_COL_SPACING*2.0f }, - { TRACK_8, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_YELLOW, +PNM9_COL_SPACING*3.0f }, - { TRACK_9, GAME_CONTROLLER_2, PNM_BUTTON_RIGHT_WHITE, +PNM9_COL_SPACING*4.0f }, + { TRACK_1, -PNM9_COL_SPACING*4.0f }, + { TRACK_2, -PNM9_COL_SPACING*3.0f }, + { TRACK_3, -PNM9_COL_SPACING*2.0f }, + { TRACK_4, -PNM9_COL_SPACING*1.0f }, + { TRACK_5, +PNM9_COL_SPACING*0.0f }, + { TRACK_6, +PNM9_COL_SPACING*1.0f }, + { TRACK_7, +PNM9_COL_SPACING*2.0f }, + { TRACK_8, +PNM9_COL_SPACING*3.0f }, + { TRACK_9, +PNM9_COL_SPACING*4.0f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, Style::END_MAPPING }, + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7,8 }, @@ -2471,26 +2629,30 @@ Style g_Styles[] = NUM_CABINET_LIGHTS, // m_iColsPerPlayer { // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; { // PLAYER_1 - { TRACK_1, GAME_CONTROLLER_1, LIGHTS_BUTTON_MARQUEE_UP_LEFT, -DANCE_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_1, LIGHTS_BUTTON_MARQUEE_UP_RIGHT, -DANCE_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_1, LIGHTS_BUTTON_MARQUEE_LR_LEFT, -DANCE_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_1, LIGHTS_BUTTON_MARQUEE_LR_RIGHT, -DANCE_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_1, LIGHTS_BUTTON_BUTTONS_LEFT, +DANCE_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_1, LIGHTS_BUTTON_BUTTONS_RIGHT, +DANCE_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_1, LIGHTS_BUTTON_BASS_LEFT, +DANCE_COL_SPACING*2.5f }, - { TRACK_8, GAME_CONTROLLER_1, LIGHTS_BUTTON_BASS_RIGHT, +DANCE_COL_SPACING*3.5f }, + { TRACK_1, -DANCE_COL_SPACING*3.5f }, + { TRACK_2, -DANCE_COL_SPACING*2.5f }, + { TRACK_3, -DANCE_COL_SPACING*1.5f }, + { TRACK_4, -DANCE_COL_SPACING*0.5f }, + { TRACK_5, +DANCE_COL_SPACING*0.5f }, + { TRACK_6, +DANCE_COL_SPACING*1.5f }, + { TRACK_7, +DANCE_COL_SPACING*2.5f }, + { TRACK_8, +DANCE_COL_SPACING*3.5f }, }, { // PLAYER_2 - { TRACK_1, GAME_CONTROLLER_2, LIGHTS_BUTTON_MARQUEE_UP_LEFT, -DANCE_COL_SPACING*3.5f }, - { TRACK_2, GAME_CONTROLLER_2, LIGHTS_BUTTON_MARQUEE_UP_RIGHT, -DANCE_COL_SPACING*2.5f }, - { TRACK_3, GAME_CONTROLLER_2, LIGHTS_BUTTON_MARQUEE_LR_LEFT, -DANCE_COL_SPACING*1.5f }, - { TRACK_4, GAME_CONTROLLER_2, LIGHTS_BUTTON_MARQUEE_LR_RIGHT, -DANCE_COL_SPACING*0.5f }, - { TRACK_5, GAME_CONTROLLER_2, LIGHTS_BUTTON_BUTTONS_LEFT, +DANCE_COL_SPACING*0.5f }, - { TRACK_6, GAME_CONTROLLER_2, LIGHTS_BUTTON_BUTTONS_RIGHT, +DANCE_COL_SPACING*1.5f }, - { TRACK_7, GAME_CONTROLLER_2, LIGHTS_BUTTON_BASS_LEFT, +DANCE_COL_SPACING*2.5f }, - { TRACK_8, GAME_CONTROLLER_2, LIGHTS_BUTTON_BASS_RIGHT, +DANCE_COL_SPACING*3.5f }, + { TRACK_1, -DANCE_COL_SPACING*3.5f }, + { TRACK_2, -DANCE_COL_SPACING*2.5f }, + { TRACK_3, -DANCE_COL_SPACING*1.5f }, + { TRACK_4, -DANCE_COL_SPACING*0.5f }, + { TRACK_5, +DANCE_COL_SPACING*0.5f }, + { TRACK_6, +DANCE_COL_SPACING*1.5f }, + { TRACK_7, +DANCE_COL_SPACING*2.5f }, + { TRACK_8, +DANCE_COL_SPACING*3.5f }, }, }, + { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] + { 0, 1, 2, 3, 4, 5, 6, 7, 8, Style::END_MAPPING }, + { 0, 1, 2, 3, 4, 5, 6, 7, 8, Style::END_MAPPING }, + }, { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; 0,1,2,3,4,5,6,7 }, diff --git a/stepmania/src/Style.cpp b/stepmania/src/Style.cpp index cee440be78..7076d47eec 100644 --- a/stepmania/src/Style.cpp +++ b/stepmania/src/Style.cpp @@ -36,39 +36,42 @@ void Style::GetTransformedNoteDataForStyle( PlayerNumber pn, const NoteData& ori noteDataOut.LoadTransformed( original, m_iColsPerPlayer, iNewToOriginalTrack ); } - GameInput Style::StyleInputToGameInput( const StyleInput& StyleI ) const { ASSERT_M( StyleI.player < NUM_PLAYERS, ssprintf("P%i", StyleI.player) ); ASSERT_M( StyleI.col < MAX_COLS_PER_PLAYER, ssprintf("C%i", StyleI.col) ); - GameController c = m_ColumnInfo[StyleI.player][StyleI.col].controller; - GameButton b = m_ColumnInfo[StyleI.player][StyleI.col].button; - return GameInput( c, b ); + + FOREACH_GameController(gc) + { + for( int i = 0; i < m_pGame->m_iButtonsPerController && m_iInputColumn[gc][i] != END_MAPPING; ++i ) + if( m_iInputColumn[gc][i] == StyleI.col ) + return GameInput( gc, i ); + } + + FAIL_M( ssprintf("Unknown StyleInput %i,%i", StyleI.player, StyleI.col) ); }; StyleInput Style::GameInputToStyleInput( const GameInput &GameI ) const { StyleInput SI; - FOREACH_PlayerNumber( p ) - { - for( int t=0; tm_MasterPlayerNumber; - - return SI; - } - } + for( int i = 0; i < GameI.button; ++i ) + { + if( m_iInputColumn[GameI.controller][i] == END_MAPPING ) + return SI; // Return invalid. } - return SI; // Didn't find a match. Return invalid. + + SI = StyleInput( (PlayerNumber) GameI.controller, m_iInputColumn[GameI.controller][i] ); + + // HACK: Looking up the player number using m_ColumnInfo + // returns the wrong answer for ONE_PLAYER_TWO_SIDES styles + if( m_StyleType == ONE_PLAYER_TWO_SIDES ) + SI.player = GAMESTATE->m_MasterPlayerNumber; + + return SI; } diff --git a/stepmania/src/Style.h b/stepmania/src/Style.h index 2a016f1426..a17d56e8de 100644 --- a/stepmania/src/Style.h +++ b/stepmania/src/Style.h @@ -37,11 +37,15 @@ public: struct ColumnInfo { int track; // take note data from this track - GameController controller; // use this instrument to hit a note on this track - GameButton button; // use this button to hit a note on this track float fXOffset; // x position of the column relative to player center }; + ColumnInfo m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER]; // maps each players' column to a track in the NoteData + + /* This maps from game inputs to columns. More than one button may map to a + * single column. */ + enum { NO_MAPPING = -1, END_MAPPING = -2 }; + int m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS]; // maps each input to a column, or GAME_BUTTON_INVALID int m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; bool m_bNeedsZoomOutWith2Players; bool m_bCanUseBeginnerHelper;