diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 2b1678518b..87aa243395 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -99,9 +99,6 @@ StyleIcon=0 LogoX=SCREEN_CENTER_X LogoY=SCREEN_CENTER_Y LogoOnCommand=zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.1;effectcolor2,1,1,1,0.3 -SongsX=SCREEN_LEFT+20 -SongsY=SCREEN_TOP+20 -SongsOnCommand=horizalign,left;diffuse,0.6,0.6,0.6,1;zoom,0.5;shadowlength,2 HelpX=SCREEN_CENTER_X HelpY=SCREEN_BOTTOM-40 HelpOnCommand=zoom,0.5 diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp index 70bc350889..45b47b574a 100644 --- a/stepmania/src/ScreenTitleMenu.cpp +++ b/stepmania/src/ScreenTitleMenu.cpp @@ -6,7 +6,6 @@ #include "StepMania.h" #include "PrefsManager.h" #include "RageLog.h" -#include "SongManager.h" #include "AnnouncerManager.h" #include "GameState.h" #include "GameManager.h" @@ -14,7 +13,6 @@ #include "GameSoundManager.h" #include "CodeDetector.h" #include "RageTextureManager.h" -#include "UnlockManager.h" #include "LightsManager.h" #include "CommonMetrics.h" #include "Game.h" @@ -50,15 +48,6 @@ void ScreenTitleMenu::Init() this->AddChild( m_sprLogo ); SET_XY_AND_ON_COMMAND( m_sprLogo ); - m_textSongs.LoadFromFont( THEME->GetPathF("Common","normal") ); - m_textSongs.SetName( "Songs" ); - CString text = ssprintf("%d songs in %d groups, %d courses in %d groups", SONGMAN->GetNumSongs(), SONGMAN->GetNumSongGroups(), SONGMAN->GetNumCourses(), SONGMAN->GetNumCourseGroups() ); - if( PREFSMAN->m_bUseUnlockSystem ) - text += ssprintf(", %d unlocks", UNLOCKMAN->GetNumUnlocks() ); - m_textSongs.SetText( text ); - this->AddChild( &m_textSongs ); - SET_XY_AND_ON_COMMAND( m_textSongs ); - this->SortByDrawOrder(); SOUND->PlayOnceFromAnnouncer( "title menu game name" ); diff --git a/stepmania/src/ScreenTitleMenu.h b/stepmania/src/ScreenTitleMenu.h index abdad1a7c5..bb430ac7b2 100644 --- a/stepmania/src/ScreenTitleMenu.h +++ b/stepmania/src/ScreenTitleMenu.h @@ -4,11 +4,6 @@ #define SCREEN_TITLE_MENU_H #include "Screen.h" -#include "Transition.h" -#include "Sprite.h" -#include "BitmapText.h" -#include "RageSound.h" -#include "RageTimer.h" #include "ScreenSelectMaster.h" class ScreenTitleMenu : public ScreenSelectMaster @@ -24,7 +19,6 @@ public: private: AutoActor m_sprLogo; - BitmapText m_textSongs; }; #endif