From 039aea4d0186c9873a668ad72051d32771d436e0 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 22 Oct 2005 21:31:40 +0000
Subject: [PATCH] cleanup, consolidate indexing by PlayerNumber

---
 stepmania/src/GhostArrowRow.cpp        | 5 +----
 stepmania/src/NoteField.cpp            | 4 +---
 stepmania/src/NoteFieldPositioning.cpp | 6 ++++--
 stepmania/src/NoteFieldPositioning.h   | 3 ++-
 stepmania/src/Player.cpp               | 5 +----
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/stepmania/src/GhostArrowRow.cpp b/stepmania/src/GhostArrowRow.cpp
index 5b4375af99..9ad2326266 100644
--- a/stepmania/src/GhostArrowRow.cpp
+++ b/stepmania/src/GhostArrowRow.cpp
@@ -76,10 +76,7 @@ void GhostArrowRow::DrawPrimitives()
 {
 	for( unsigned c=0; c<m_Ghost.size(); c++ )
 	{
-		// TODO: Remove indexing by PlayerNumber.
-		PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
-
-		NoteFieldMode::BeginDrawTrack( pn, c );
+		NoteFieldMode::BeginDrawTrack( m_pPlayerState, c );
 		m_Ghost[c]->Draw();
 		NoteFieldMode::EndDrawTrack( c );
 	}
diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 8a52eac661..a73c3c7b00 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -670,9 +670,7 @@ void NoteField::DrawPrimitives()
 
 	for( int c=0; c<m_pNoteData->GetNumTracks(); c++ )	// for each arrow column
 	{
-		// TODO: Remove use of PlayerNumber.
-		PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
-		NoteFieldMode::BeginDrawTrack( pn, c );
+		NoteFieldMode::BeginDrawTrack( m_pPlayerState, c );
 
 		//
 		// Draw all HoldNotes in this column (so that they appear under the tap notes)
diff --git a/stepmania/src/NoteFieldPositioning.cpp b/stepmania/src/NoteFieldPositioning.cpp
index a7f4caeaf8..e006779d53 100644
--- a/stepmania/src/NoteFieldPositioning.cpp
+++ b/stepmania/src/NoteFieldPositioning.cpp
@@ -5,8 +5,9 @@
 #include "RageLog.h"
 #include "GameState.h"
 #include "Style.h"
+#include "PlayerState.h"
 
-void NoteFieldMode::BeginDrawTrack( PlayerNumber pn, int iTrack )
+void NoteFieldMode::BeginDrawTrack( const PlayerState* pPlayerState, int iTrack )
 {
 	DISPLAY->CameraPushMatrix();
 
@@ -15,7 +16,8 @@ void NoteFieldMode::BeginDrawTrack( PlayerNumber pn, int iTrack )
 	DISPLAY->PushMatrix();
 
 	const Style *s = GAMESTATE->GetCurrentStyle();
-	const float fPixelXOffsetFromCenter = s->m_ColumnInfo[pn][iTrack].fXOffset;
+	// TODO: Remove indexing by PlayerNumber.
+	float fPixelXOffsetFromCenter = s->m_ColumnInfo[pPlayerState->m_PlayerNumber][iTrack].fXOffset;
 	DISPLAY->Translate( fPixelXOffsetFromCenter, 0, 0 );
 }
 
diff --git a/stepmania/src/NoteFieldPositioning.h b/stepmania/src/NoteFieldPositioning.h
index c146b6c69d..c191705e0c 100644
--- a/stepmania/src/NoteFieldPositioning.h
+++ b/stepmania/src/NoteFieldPositioning.h
@@ -3,9 +3,10 @@
 
 #include "PlayerNumber.h"
 
+class PlayerState;
 namespace NoteFieldMode
 {
-	void BeginDrawTrack( PlayerNumber pn, int iTrack );
+	void BeginDrawTrack( const PlayerState* pPlayerState, int iTrack );
 	void EndDrawTrack( int iTrack );
 };
 
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index db605082de..9233b75210 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -857,12 +857,9 @@ void Player::DrawHoldJudgments()
 	if( m_pPlayerState->m_PlayerOptions.m_fBlind > 0 )
 		return;
 
-	// TODO: Remove use of PlayerNumber.
-	PlayerNumber pn = m_pPlayerState->m_PlayerNumber;
-
 	for( int c=0; c<m_NoteData.GetNumTracks(); c++ )
 	{
-		NoteFieldMode::BeginDrawTrack( pn, c );
+		NoteFieldMode::BeginDrawTrack( m_pPlayerState, c );
 
 		m_vHoldJudgment[c]->Draw();