From eb061fa03d5529765cb0ef7f4fe9a85f1896e7dc Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Wed, 2 May 2012 19:24:08 -0500
Subject: [PATCH] Make ReceptorArrowRow and GhostArrowRow respect the column
 draw order. [hanubeki]   Sourced from
 http://code.google.com/r/hanubeki-modified-sm-ssc/source/detail?r=8ccf7449651eef51e8c42d031aa64da49a0b72ce

---
 Docs/Changelog_sm5.txt   | 6 +++++-
 src/GhostArrowRow.cpp    | 4 +++-
 src/ReceptorArrowRow.cpp | 6 +++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index f408432cc4..7b4201dcd4 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -6,9 +6,13 @@ ________________________________________________________________________________
 
 ================================================================================
 
-StepMania 5.0 alpha 2 | 201204??
+StepMania 5.0 alpha 2 | 201205??
 --------------------------------------------------------------------------------
 
+2012/05/02
+* Make ReceptorArrowRow and GhostArrowRow respect the column draw order. [hanubeki]
+  Sourced from http://code.google.com/r/hanubeki-modified-sm-ssc/source/detail?r=8ccf7449651eef51e8c42d031aa64da49a0b72ce
+
 2012/04/25
 ----------
 * [Profile] Added GetLastPlayedSong and GetLastPlayedCourse Lua bindings. [AJ]
diff --git a/src/GhostArrowRow.cpp b/src/GhostArrowRow.cpp
index f81eef75d6..934abbd461 100644
--- a/src/GhostArrowRow.cpp
+++ b/src/GhostArrowRow.cpp
@@ -87,8 +87,10 @@ void GhostArrowRow::Update( float fDeltaTime )
 
 void GhostArrowRow::DrawPrimitives()
 {
-	for( unsigned c=0; c<m_Ghost.size(); c++ )
+	const Style* pStyle = GAMESTATE->GetCurrentStyle();
+	for( unsigned i=0; i<m_Ghost.size(); i++ )
 	{
+		const int c = pStyle->m_iColumnDrawOrder[i];
 		m_Ghost[c]->Draw();
 	}
 }
diff --git a/src/ReceptorArrowRow.cpp b/src/ReceptorArrowRow.cpp
index 7acb928da9..276c63eb90 100644
--- a/src/ReceptorArrowRow.cpp
+++ b/src/ReceptorArrowRow.cpp
@@ -66,8 +66,12 @@ void ReceptorArrowRow::Update( float fDeltaTime )
 
 void ReceptorArrowRow::DrawPrimitives()
 {
-	for( unsigned c=0; c<m_ReceptorArrow.size(); c++ ) 
+	const Style* pStyle = GAMESTATE->GetCurrentStyle();
+	for( unsigned i=0; i<m_ReceptorArrow.size(); i++ )
+	{
+		const int c = pStyle->m_iColumnDrawOrder[i];
 		m_ReceptorArrow[c]->Draw();
+	}
 }
 
 void ReceptorArrowRow::Step( int iCol, TapNoteScore score )