From 4a1056736296bab0e9a680fb367eed0ffa87a833 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 19 Jun 2005 22:29:25 +0000 Subject: [PATCH] remove texts. If you want to do this, do it in the overlay or underlay layers. Text=@GAMESTATE:GetCurrentSong():GetDisplayFullTitle() --- stepmania/src/ScreenStage.cpp | 24 ------------------------ stepmania/src/ScreenStage.h | 2 -- 2 files changed, 26 deletions(-) diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp index 61f2ac9b88..6cd9f6e0ba 100644 --- a/stepmania/src/ScreenStage.cpp +++ b/stepmania/src/ScreenStage.cpp @@ -73,28 +73,6 @@ void ScreenStage::Init() this->AddChild( &m_sprCharacterIcon[p] ); } - m_SongTitle.SetName( "SongTitle"); - m_Artist.SetName( "Artist" ); - m_SongTitle.LoadFromFont( THEME->GetPathF(m_sName,"Title") ); - m_Artist.LoadFromFont( THEME->GetPathF(m_sName,"Artist") ); - - this->AddChild( &m_SongTitle ); - this->AddChild( &m_Artist ); - - if(GAMESTATE->m_pCurSong != NULL) - { - m_SongTitle.SetText( GAMESTATE->m_pCurSong->m_sMainTitle ); - m_Artist.SetText( GAMESTATE->m_pCurSong->m_sArtist ); - } - else - { - m_SongTitle.SetText( "" ); - m_Artist.SetText( "" ); - } - - SET_XY_AND_ON_COMMAND( m_Artist ); - SET_XY_AND_ON_COMMAND( m_SongTitle ); - SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("stage "+StageToString(GAMESTATE->GetCurrentStage())) ); this->SortByDrawOrder(); @@ -117,8 +95,6 @@ void ScreenStage::HandleScreenMessage( const ScreenMessage SM ) m_Out.StartTransitioning(); FOREACH_PlayerNumber( p ) OFF_COMMAND( m_sprCharacterIcon[p] ); - OFF_COMMAND( m_SongTitle ); - OFF_COMMAND( m_Artist ); this->PostScreenMessage( SM_GoToNextScreen, this->GetTweenTimeLeft() ); } else if( SM == SM_GoToNextScreen ) diff --git a/stepmania/src/ScreenStage.h b/stepmania/src/ScreenStage.h index deecc7376b..a4a7f80eb1 100644 --- a/stepmania/src/ScreenStage.h +++ b/stepmania/src/ScreenStage.h @@ -26,8 +26,6 @@ private: Transition m_In, m_Out, m_Cancel; AutoActor m_Overlay; // overlays all elements except bitmaptexts - BitmapText m_SongTitle; - BitmapText m_Artist; // elements that cannot be created with BGAnimation Sprite m_sprCharacterIcon[NUM_PLAYERS];