From d2e3c4b22c7c8a50aada9c1dab0dbbef5015ba7c Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 11 Mar 2007 23:26:49 +0000
Subject: [PATCH] fix use of m_iColumnDrawOrder in pump, draw inner-most first
 and outermost last

---
 stepmania/src/GameManager.cpp | 12 ++++++------
 stepmania/src/NoteField.cpp   |  6 +++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/stepmania/src/GameManager.cpp b/stepmania/src/GameManager.cpp
index baea4bbf9f..abde2c7a0e 100644
--- a/stepmania/src/GameManager.cpp
+++ b/stepmania/src/GameManager.cpp
@@ -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
diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index dbcb134823..1d8dfacfa5 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -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)
 		//