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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2004-04-25 08:54:10 +00:00
parent f03f1b527b
commit 4e073c4776
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenStage.cpp
+4 -10
View File
@@ -115,9 +115,8 @@ void ScreenStage::Update( float fDeltaTime )
m_sprCharacterIcon[p].Update(fDeltaTime); m_sprCharacterIcon[p].Update(fDeltaTime);
m_Overlay.Update(fDeltaTime); m_Overlay.Update(fDeltaTime);
if ( PREFSMAN->m_bShowBanners ) if ( PREFSMAN->m_bShowBanners )
if( GAMESTATE->m_pCurSong != NULL) if( GAMESTATE->m_pCurSong && GAMESTATE->m_pCurSong->HasBanner() )
if( GAMESTATE->m_pCurSong->HasBanner() ) m_Banner.Update(fDeltaTime);
m_Banner.Update(fDeltaTime);
m_SongTitle.Update(fDeltaTime); m_SongTitle.Update(fDeltaTime);
m_Artist.Update(fDeltaTime); m_Artist.Update(fDeltaTime);
} }
@@ -127,14 +126,11 @@ void ScreenStage::DrawPrimitives()
Screen::DrawPrimitives(); Screen::DrawPrimitives();
int p; int p;
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{
m_sprCharacterIcon[p].Draw(); m_sprCharacterIcon[p].Draw();
}
m_Overlay.Draw(); m_Overlay.Draw();
if ( PREFSMAN->m_bShowBanners ) if ( PREFSMAN->m_bShowBanners )
if( GAMESTATE->m_pCurSong != NULL) if( GAMESTATE->m_pCurSong && GAMESTATE->m_pCurSong->HasBanner() )
if( GAMESTATE->m_pCurSong->HasBanner() ) m_Banner.Draw();
m_Banner.Draw();
m_SongTitle.Draw(); m_SongTitle.Draw();
m_Artist.Draw(); m_Artist.Draw();
} }
@@ -150,9 +146,7 @@ void ScreenStage::HandleScreenMessage( const ScreenMessage SM )
m_Out.StartTransitioning( SM_GoToNextScreen ); m_Out.StartTransitioning( SM_GoToNextScreen );
int p; int p;
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{
OFF_COMMAND( m_sprCharacterIcon[p] ); OFF_COMMAND( m_sprCharacterIcon[p] );
}
OFF_COMMAND( m_SongTitle ); OFF_COMMAND( m_SongTitle );
OFF_COMMAND( m_Artist ); OFF_COMMAND( m_Artist );
OFF_COMMAND( m_Banner ); OFF_COMMAND( m_Banner );