From b8ed7366c73ed965c2b643060571f635bb09ece2 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 18 Jan 2006 20:35:55 +0000
Subject: [PATCH] simplify

---
 stepmania/src/ScreenGameplay.cpp | 46 ++++++++++++++++----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 9fb1ca3d69..77125907a0 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -669,30 +669,10 @@ void ScreenGameplay::Init()
 		pi->m_ptextPlayerOptions->SetName( ssprintf("PlayerOptions%s",pi->GetName().c_str()) );
 		SET_XY( pi->m_ptextPlayerOptions );
 		this->AddChild( pi->m_ptextPlayerOptions );
-	}
 
-	m_textSongOptions.LoadFromFont( THEME->GetPathF(m_sName,"song options") );
-	m_textSongOptions.SetShadowLength( 0 );
-	m_textSongOptions.SetName( "SongOptions" );
-	SET_XY( m_textSongOptions );
-	m_textSongOptions.SetText( GAMESTATE->m_SongOptions.GetString() );
-	this->AddChild( &m_textSongOptions );
-
-	FOREACH_VisiblePlayerInfo( m_vPlayerInfo, pi )
-	{
-		ASSERT( pi->m_pActiveAttackList == NULL );
-		pi->m_pActiveAttackList = new ActiveAttackList;
-		pi->m_pActiveAttackList->LoadFromFont( THEME->GetPathF(m_sName,"ActiveAttackList") );
-		pi->m_pActiveAttackList->Init( pi->GetPlayerState() );
-		pi->m_pActiveAttackList->SetName( ssprintf("ActiveAttackList%s",pi->GetName().c_str()) );
-		SET_XY( pi->m_pActiveAttackList );
-		this->AddChild( pi->m_pActiveAttackList );
-	}
-
-
-
-	FOREACH_EnabledPlayerNumberInfo( m_vPlayerInfo, pi )
-	{
+		//
+		// Difficulty icon and meter
+		//
 		ASSERT( pi->m_pDifficultyIcon == NULL );
 		pi->m_pDifficultyIcon = new DifficultyIcon;
 		pi->m_pDifficultyIcon->Load( THEME->GetPathG(m_sName,ssprintf("difficulty icons %dx%d",NUM_PLAYERS,NUM_Difficulty)) );
@@ -715,6 +695,26 @@ void ScreenGameplay::Init()
 //		}
 	}
 
+	m_textSongOptions.LoadFromFont( THEME->GetPathF(m_sName,"song options") );
+	m_textSongOptions.SetShadowLength( 0 );
+	m_textSongOptions.SetName( "SongOptions" );
+	SET_XY( m_textSongOptions );
+	m_textSongOptions.SetText( GAMESTATE->m_SongOptions.GetString() );
+	this->AddChild( &m_textSongOptions );
+
+	FOREACH_VisiblePlayerInfo( m_vPlayerInfo, pi )
+	{
+		ASSERT( pi->m_pActiveAttackList == NULL );
+		pi->m_pActiveAttackList = new ActiveAttackList;
+		pi->m_pActiveAttackList->LoadFromFont( THEME->GetPathF(m_sName,"ActiveAttackList") );
+		pi->m_pActiveAttackList->Init( pi->GetPlayerState() );
+		pi->m_pActiveAttackList->SetName( ssprintf("ActiveAttackList%s",pi->GetName().c_str()) );
+		SET_XY( pi->m_pActiveAttackList );
+		this->AddChild( pi->m_pActiveAttackList );
+	}
+
+
+
 
 	if( PREFSMAN->m_bShowLyrics )
 		this->AddChild( &m_LyricDisplay );