actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-18 20:35:55 +00:00
parent a5bb62352f
commit b8ed7366c7
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+23 -23
View File
@@ -669,30 +669,10 @@ void ScreenGameplay::Init()
pi->m_ptextPlayerOptions->SetName( ssprintf("PlayerOptions%s",pi->GetName().c_str()) ); pi->m_ptextPlayerOptions->SetName( ssprintf("PlayerOptions%s",pi->GetName().c_str()) );
SET_XY( pi->m_ptextPlayerOptions ); SET_XY( pi->m_ptextPlayerOptions );
this->AddChild( pi->m_ptextPlayerOptions ); this->AddChild( pi->m_ptextPlayerOptions );
}
m_textSongOptions.LoadFromFont( THEME->GetPathF(m_sName,"song options") ); //
m_textSongOptions.SetShadowLength( 0 ); // Difficulty icon and meter
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 )
{
ASSERT( pi->m_pDifficultyIcon == NULL ); ASSERT( pi->m_pDifficultyIcon == NULL );
pi->m_pDifficultyIcon = new DifficultyIcon; pi->m_pDifficultyIcon = new DifficultyIcon;
pi->m_pDifficultyIcon->Load( THEME->GetPathG(m_sName,ssprintf("difficulty icons %dx%d",NUM_PLAYERS,NUM_Difficulty)) ); 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 ) if( PREFSMAN->m_bShowLyrics )
this->AddChild( &m_LyricDisplay ); this->AddChild( &m_LyricDisplay );