shakesoda fixes up kb7 spacing again

This commit is contained in:
AJ Kelly
2010-06-28 20:04:04 -05:00
parent 113c59ceae
commit e06b52bc90
2 changed files with 37 additions and 22 deletions
+21 -22
View File
@@ -917,7 +917,7 @@ static const AutoMappings g_AutoKeyMappings_KB7 = AutoMappings (
);
//ThemeMetric<int> KB7_COL_SPACING ("ColumnSpacing","KB7");
static const int KB7_COL_SPACING = 54;
static const int KB7_COL_SPACING = 64;
static const Style g_Style_KB7_Single =
{ // STYLE_KB7_SINGLE
true, // m_bUsedForGameplay
@@ -929,7 +929,6 @@ static const Style g_Style_KB7_Single =
StyleType_OnePlayerOneSide, // m_StyleType
7, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
// intentionally different
{ // PLAYER_1
{ TRACK_1, -KB7_COL_SPACING*3.0f, NULL },
{ TRACK_2, -KB7_COL_SPACING*2.0f, NULL },
@@ -940,13 +939,13 @@ static const Style g_Style_KB7_Single =
{ TRACK_7, +KB7_COL_SPACING*3.0f, NULL },
},
{ // PLAYER_2
{ TRACK_1, -KB7_COL_SPACING*2.5f, NULL },
{ TRACK_2, -KB7_COL_SPACING*1.5f, NULL },
{ TRACK_3, -KB7_COL_SPACING*0.5f, NULL },
{ TRACK_1, -KB7_COL_SPACING*3.0f, NULL },
{ TRACK_2, -KB7_COL_SPACING*2.0f, NULL },
{ TRACK_3, -KB7_COL_SPACING*1.0f, NULL },
{ TRACK_4, +KB7_COL_SPACING*0.0f, NULL },
{ TRACK_5, +KB7_COL_SPACING*0.5f, NULL },
{ TRACK_6, +KB7_COL_SPACING*1.5f, NULL },
{ TRACK_7, +KB7_COL_SPACING*2.5f, NULL },
{ TRACK_5, +KB7_COL_SPACING*1.0f, NULL },
{ TRACK_6, +KB7_COL_SPACING*2.0f, NULL },
{ TRACK_7, +KB7_COL_SPACING*3.0f, NULL },
},
},
{ // m_iInputColumn[NUM_GameController][NUM_GameButton]
@@ -954,7 +953,7 @@ static const Style g_Style_KB7_Single =
{ 0, 1, 2, 3, 4, 5, 6, Style::END_MAPPING },
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
4,0,1,2,3,5,6 // doesn't work?
0,1,2,3,4,5,6 // doesn't work?
},
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
@@ -973,22 +972,22 @@ static const Style g_Style_KB7_Versus =
7, // m_iColsPerPlayer
{ // m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];
{ // PLAYER_1
{ TRACK_1, -KB7_COL_SPACING*2.5f, NULL },
{ TRACK_2, -KB7_COL_SPACING*1.5f, NULL },
{ TRACK_3, -KB7_COL_SPACING*0.5f, NULL },
{ TRACK_1, -KB7_COL_SPACING*3.0f, NULL },
{ TRACK_2, -KB7_COL_SPACING*2.0f, NULL },
{ TRACK_3, -KB7_COL_SPACING*1.0f, NULL },
{ TRACK_4, +KB7_COL_SPACING*0.0f, NULL },
{ TRACK_5, +KB7_COL_SPACING*0.5f, NULL },
{ TRACK_6, +KB7_COL_SPACING*1.5f, NULL },
{ TRACK_7, +KB7_COL_SPACING*2.5f, NULL },
{ TRACK_5, +KB7_COL_SPACING*1.0f, NULL },
{ TRACK_6, +KB7_COL_SPACING*2.0f, NULL },
{ TRACK_7, +KB7_COL_SPACING*3.0f, NULL },
},
{ // PLAYER_2
{ TRACK_1, -KB7_COL_SPACING*2.5f, NULL },
{ TRACK_2, -KB7_COL_SPACING*1.5f, NULL },
{ TRACK_3, -KB7_COL_SPACING*0.5f, NULL },
{ TRACK_1, -KB7_COL_SPACING*3.0f, NULL },
{ TRACK_2, -KB7_COL_SPACING*2.0f, NULL },
{ TRACK_3, -KB7_COL_SPACING*1.0f, NULL },
{ TRACK_4, +KB7_COL_SPACING*0.0f, NULL },
{ TRACK_5, +KB7_COL_SPACING*0.5f, NULL },
{ TRACK_6, +KB7_COL_SPACING*1.5f, NULL },
{ TRACK_7, +KB7_COL_SPACING*2.5f, NULL },
{ TRACK_5, +KB7_COL_SPACING*1.0f, NULL },
{ TRACK_6, +KB7_COL_SPACING*2.0f, NULL },
{ TRACK_7, +KB7_COL_SPACING*3.0f, NULL },
},
},
{ // m_iInputColumn[NUM_GameController][NUM_GameButton]
@@ -996,7 +995,7 @@ static const Style g_Style_KB7_Versus =
{ 0, 1, 2, 3, 4, 5, 6, Style::END_MAPPING },
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
4,0,1,2,3,5,6
0,1,2,3,4,5,6
},
true, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper