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

Cleanup and simplify metrics

Browse Source
This commit is contained in:
Josh Allen
2006-08-14 16:51:31 +00:00
parent 9ee66decab
commit 94ccc62a4b
1 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RoomInfoDisplay.cpp
+11 -12
View File
@@ -19,7 +19,7 @@ void RoomInfoDisplay::DeployInfoBox()
{ {
if (m_state == CLOSED) if (m_state == CLOSED)
{ {
SET_XY_AND_ON_COMMAND( this ); ON_COMMAND( this );
m_state = OPEN; m_state = OPEN;
} }
} }
@@ -41,8 +41,6 @@ void RoomInfoDisplay::Load( RString sType )
PLAYERLISTOFFSETX.Load( sType, "PlayerListElementOffsetX" ); PLAYERLISTOFFSETX.Load( sType, "PlayerListElementOffsetX" );
PLAYERLISTOFFSETY.Load( sType, "PlayerListElementOffsetY" ); PLAYERLISTOFFSETY.Load( sType, "PlayerListElementOffsetY" );
m_state = LOCKED;
m_bg.Load( THEME->GetPathG(m_sName,"Background") ); m_bg.Load( THEME->GetPathG(m_sName,"Background") );
m_bg->SetName( "Background" ); m_bg->SetName( "Background" );
this->AddChild( m_bg ); this->AddChild( m_bg );
@@ -51,14 +49,14 @@ void RoomInfoDisplay::Load( RString sType )
m_Title.SetName( "RoomTitle" ); m_Title.SetName( "RoomTitle" );
m_Title.SetShadowLength( 0 ); m_Title.SetShadowLength( 0 );
m_Title.SetHorizAlign( align_left ); m_Title.SetHorizAlign( align_left );
SET_XY_AND_ON_COMMAND(m_Title); ON_COMMAND( m_Title );
this->AddChild( &m_Title ); this->AddChild( &m_Title );
m_Desc.LoadFromFont( THEME->GetPathF(sType,"text") ); m_Desc.LoadFromFont( THEME->GetPathF(sType,"text") );
m_Desc.SetName( "RoomDesc" ); m_Desc.SetName( "RoomDesc" );
m_Desc.SetShadowLength( 0 ); m_Desc.SetShadowLength( 0 );
m_Desc.SetHorizAlign( align_left ); m_Desc.SetHorizAlign( align_left );
SET_XY_AND_ON_COMMAND(m_Desc); ON_COMMAND( m_Desc );
this->AddChild( &m_Desc ); this->AddChild( &m_Desc );
m_lastRound.LoadFromFont( THEME->GetPathF(sType,"text") ); m_lastRound.LoadFromFont( THEME->GetPathF(sType,"text") );
@@ -66,40 +64,41 @@ void RoomInfoDisplay::Load( RString sType )
m_lastRound.SetText( "Last Round Info:" ); m_lastRound.SetText( "Last Round Info:" );
m_lastRound.SetShadowLength( 0 ); m_lastRound.SetShadowLength( 0 );
m_lastRound.SetHorizAlign( align_left ); m_lastRound.SetHorizAlign( align_left );
SET_XY_AND_ON_COMMAND(m_lastRound); ON_COMMAND( m_lastRound );
this->AddChild( &m_lastRound ); this->AddChild( &m_lastRound );
m_songTitle.LoadFromFont( THEME->GetPathF(sType,"text") ); m_songTitle.LoadFromFont( THEME->GetPathF(sType,"text") );
m_songTitle.SetName( "SongTitle" ); m_songTitle.SetName( "SongTitle" );
m_songTitle.SetShadowLength( 0 ); m_songTitle.SetShadowLength( 0 );
m_songTitle.SetHorizAlign( align_left ); m_songTitle.SetHorizAlign( align_left );
SET_XY_AND_ON_COMMAND(m_songTitle); ON_COMMAND( m_songTitle );
this->AddChild( &m_songTitle ); this->AddChild( &m_songTitle );
m_songSub.LoadFromFont( THEME->GetPathF(sType,"text") ); m_songSub.LoadFromFont( THEME->GetPathF(sType,"text") );
m_songSub.SetName( "SongSubTitle" ); m_songSub.SetName( "SongSubTitle" );
m_songSub.SetShadowLength( 0 ); m_songSub.SetShadowLength( 0 );
m_songSub.SetHorizAlign( align_left ); m_songSub.SetHorizAlign( align_left );
SET_XY_AND_ON_COMMAND(m_songSub); ON_COMMAND( m_songSub );
this->AddChild( &m_songSub ); this->AddChild( &m_songSub );
m_songArtist.LoadFromFont( THEME->GetPathF(sType,"text") ); m_songArtist.LoadFromFont( THEME->GetPathF(sType,"text") );
m_songArtist.SetName( "SongArtist" ); m_songArtist.SetName( "SongArtist" );
m_songArtist.SetShadowLength( 0 ); m_songArtist.SetShadowLength( 0 );
m_songArtist.SetHorizAlign( align_left ); m_songArtist.SetHorizAlign( align_left );
SET_XY_AND_ON_COMMAND(m_songArtist); ON_COMMAND( m_songArtist );
this->AddChild( &m_songArtist ); this->AddChild( &m_songArtist );
m_players.LoadFromFont( THEME->GetPathF(sType,"text") ); m_players.LoadFromFont( THEME->GetPathF(sType,"text") );
m_players.SetName( "Players" ); m_players.SetName( "Players" );
m_players.SetShadowLength( 0 ); m_players.SetShadowLength( 0 );
m_players.SetHorizAlign( align_left ); m_players.SetHorizAlign( align_left );
SET_XY_AND_ON_COMMAND(m_players); ON_COMMAND( m_players );
this->AddChild( &m_players ); this->AddChild( &m_players );
SET_XY_AND_ON_COMMAND( this );
OFF_COMMAND( this ); OFF_COMMAND( this );
StopTweening(); FinishTweening();
m_state = LOCKED;
} }
void RoomInfoDisplay::SetRoom( const RoomWheelData* roomData ) void RoomInfoDisplay::SetRoom( const RoomWheelData* roomData )