From 2e95edf9da0b86b8c0a9fc3db554369a29df20f0 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 3 Feb 2006 09:31:51 +0000
Subject: [PATCH] PositionIcons(pn)

---
 stepmania/src/OptionRow.cpp     | 17 +++++++----------
 stepmania/src/OptionRow.h       |  2 +-
 stepmania/src/ScreenOptions.cpp |  5 +++--
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index a890ebbd50..8c4b8c7063 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -510,19 +510,16 @@ void OptionRow::PositionUnderlines( PlayerNumber pn )
 	}
 }
 
-void OptionRow::PositionIcons()
+void OptionRow::PositionIcons( PlayerNumber pn )
 {
-	FOREACH_HumanPlayer( p )	// foreach player
-	{
-		OptionIcon *pIcon = m_OptionIcons[p];
-		if( pIcon == NULL )
-			continue;
+	OptionIcon *pIcon = m_OptionIcons[pn];
+	if( pIcon == NULL )
+		return;
 
-		pIcon->SetX( m_pParentType->ICONS_X.GetValue(p) );
+	pIcon->SetX( m_pParentType->ICONS_X.GetValue(pn) );
 
-		/* XXX: this doesn't work since icon is an ActorFrame */
-		pIcon->SetDiffuse( RageColor(1,1,1, m_bHidden? 0.0f:1.0f) );
-	}
+	/* XXX: this doesn't work since icon is an ActorFrame */
+	pIcon->SetDiffuse( RageColor(1,1,1, m_bHidden? 0.0f:1.0f) );
 }
 
 /* This is called when the focus changes, to update "long row" text. */
diff --git a/stepmania/src/OptionRow.h b/stepmania/src/OptionRow.h
index bab70ef82a..1884143d6a 100644
--- a/stepmania/src/OptionRow.h
+++ b/stepmania/src/OptionRow.h
@@ -147,7 +147,7 @@ public:
 
 	void ChoicesChanged();
 	void PositionUnderlines( PlayerNumber pn );
-	void PositionIcons();
+	void PositionIcons( PlayerNumber pn );
 	void UpdateText( PlayerNumber pn );
 	void SetRowHasFocus( PlayerNumber pn, bool bRowHasFocus );
 	void UpdateEnabledDisabled();
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index c15e31560d..b9a1a40d01 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -384,8 +384,9 @@ void ScreenOptions::GetWidthXY( PlayerNumber pn, int iRow, int iChoiceOnRow, int
 
 void ScreenOptions::PositionIcons()
 {
-	for( unsigned i=0; i<m_pRows.size(); i++ )	// foreach options line
-		m_pRows[i]->PositionIcons();
+	FOREACH_HumanPlayer( pn )	// foreach player
+		for( unsigned i=0; i<m_pRows.size(); i++ )	// foreach options line
+			m_pRows[i]->PositionIcons( pn );
 }
 
 void ScreenOptions::RefreshIcons( int iRow, PlayerNumber pn )