diff --git a/stepmania/src/HelpDisplay.cpp b/stepmania/src/HelpDisplay.cpp index 4a9fbb6a7e..c771925733 100644 --- a/stepmania/src/HelpDisplay.cpp +++ b/stepmania/src/HelpDisplay.cpp @@ -116,71 +116,6 @@ public: LUA_REGISTER_DERIVED_CLASS( HelpDisplay, BitmapText ) - -#include "song.h" -#include "GameState.h" -#include "Course.h" -#include "Style.h" -#include "Foreach.h" - -REGISTER_ACTOR_CLASS( GenreDisplay ) - -GenreDisplay::GenreDisplay() -{ - this->SubscribeToMessage( Message_CurrentSongChanged ); - this->SubscribeToMessage( Message_CurrentCourseChanged ); -} - -GenreDisplay::~GenreDisplay() -{ -} - -void GenreDisplay::PlayCommand( const RString &sCommandName ) -{ - if( sCommandName == MessageToString(Message_CurrentSongChanged) ) - { - vector m_Artists, m_AltArtists; - - Song* pSong = GAMESTATE->m_pCurSong; - ASSERT( pSong ); - - m_Artists.push_back( pSong->GetDisplayArtist() ); - m_AltArtists.push_back( pSong->GetTranslitArtist() ); - - SetTips( m_Artists, m_AltArtists ); - } - else if( sCommandName == MessageToString(Message_CurrentCourseChanged) ) - { - vector m_Artists, m_AltArtists; - - Course* pCourse = GAMESTATE->m_pCurCourse; - StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType; - Trail *pTrail = pCourse->GetTrail( st ); - ASSERT( pTrail ); - - FOREACH_CONST( TrailEntry, pTrail->m_vEntries, e ) - { - if( e->bSecret ) - { - m_Artists.push_back( "???" ); - m_AltArtists.push_back( "???" ); - } - else - { - m_Artists.push_back( e->pSong->GetDisplayArtist() ); - m_AltArtists.push_back( e->pSong->GetTranslitArtist() ); - } - } - - SetTips( m_Artists, m_AltArtists ); - } - else - { - Actor::PlayCommand( sCommandName ); - } -} - - /* * (c) 2001-2003 Chris Danford, Glenn Maynard * All rights reserved. diff --git a/stepmania/src/HelpDisplay.h b/stepmania/src/HelpDisplay.h index 44a9f31295..bcd814ded9 100644 --- a/stepmania/src/HelpDisplay.h +++ b/stepmania/src/HelpDisplay.h @@ -34,15 +34,6 @@ protected: float m_fSecsUntilSwitch; }; -class GenreDisplay : public HelpDisplay -{ -public: - GenreDisplay(); - ~GenreDisplay(); - void PlayCommand( const RString &sCommandName ); - virtual Actor *Copy() const; -}; - #endif /*