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

fix use of m_iColumnDrawOrder

Browse Source 
in pump, draw inner-most first and outermost last
This commit is contained in:
Chris Danford
2007-03-11 23:26:49 +00:00
parent 8995426f84
commit d2e3c4b22c
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameManager.cpp
+6 -6
View File
@@ -952,7 +952,7 @@ static Style g_Styles[] =
{ 1, 3, 2, 0, 4, Style::END_MAPPING },
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,2,4,1,3
2,1,3,0,4
},
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
@@ -989,7 +989,7 @@ static Style g_Styles[] =
{ 1, 3, 2, 0, 4, Style::END_MAPPING },
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,2,4,1,3
2,1,3,0,4
},
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
@@ -1028,7 +1028,7 @@ static Style g_Styles[] =
{ 3, Style::NO_MAPPING, 5, 4, Style::NO_MAPPING, Style::END_MAPPING }
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,5,2,4,3,1
2,3,1,4,0,5
},
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
@@ -1075,7 +1075,7 @@ static Style g_Styles[] =
{ 6, 8, 7, 5, 9, Style::END_MAPPING },
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,2,4,1,3,5,7,9,6,8
2,1,3,0,4, 2+5,1+5,3+5,0+5,4+5
},
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
@@ -1112,7 +1112,7 @@ static Style g_Styles[] =
{ 1, 3, 2, 0, 4, Style::END_MAPPING },
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,2,4,1,3
2,1,3,0,4
},
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
@@ -1154,7 +1154,7 @@ static Style g_Styles[] =
{ 1, 3, 2, 0, 4, 6, 8, 7, 5, 9, Style::END_MAPPING },
},
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,2,4,1,3
2,1,3,0,4
},
false, // m_bNeedsZoomOutWith2Players
false, // m_bCanUseBeginnerHelper
stepmania/src/NoteField.cpp
+5 -1
View File
@@ -741,8 +741,12 @@ void NoteField::DrawPrimitives()
float fSelectedRangeGlow = SCALE( RageFastCos(RageTimer::GetTimeSinceStartFast()*2), -1, 1, 0.1f, 0.3f );
for( int c=0; c<m_pNoteData->GetNumTracks(); c++ ) // for each arrow column
const Style* pStyle = GAMESTATE->GetCurrentStyle();
ASSERT( GAMESTATE->GetCurrentStyle()->m_iColsPerPlayer == m_pNoteData->GetNumTracks() );
for( int i=0; i<m_pNoteData->GetNumTracks(); i++ ) // for each arrow column
{
const int c = pStyle->m_iColumnDrawOrder[i];
//
// Draw all HoldNotes in this column (so that they appear under the tap notes)
//