From 5b0e0525d850641f2ebfa515b5023d27899eae98 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 3 Mar 2007 04:23:20 +0000 Subject: [PATCH] remove unused --- stepmania/src/ScreenGameplay.cpp | 22 ---------------------- stepmania/src/ScreenGameplay.h | 2 -- 2 files changed, 24 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index f6d7816bf4..153535a869 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -114,7 +114,6 @@ PlayerInfo::PlayerInfo() m_pPlayer = NULL; m_pInventory = NULL; m_pDifficultyIcon = NULL; - m_pDifficultyMeter = NULL; } void PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField ) @@ -182,7 +181,6 @@ void PlayerInfo::Load( PlayerNumber pn, MultiPlayer mp, bool bShowNoteField ) m_pPlayer = new Player( m_NoteData, bShowNoteField ); m_pInventory = NULL; m_pDifficultyIcon = NULL; - m_pDifficultyMeter = NULL; if( IsMultiPlayer() ) { @@ -216,7 +214,6 @@ PlayerInfo::~PlayerInfo() SAFE_DELETE( m_pPlayer ); SAFE_DELETE( m_pInventory ); SAFE_DELETE( m_pDifficultyIcon ); - SAFE_DELETE( m_pDifficultyMeter ); } void PlayerInfo::ShowOniGameOver() @@ -653,13 +650,6 @@ void ScreenGameplay::Init() /* Position it in LoadNextSong. */ this->AddChild( pi->m_pDifficultyIcon ); - ASSERT( pi->m_pDifficultyMeter == NULL ); - pi->m_pDifficultyMeter = new DifficultyMeter; - pi->m_pDifficultyMeter->Load( m_sName + ssprintf(" DifficultyMeter%s",pi->GetName().c_str()) ); - ActorUtil::LoadAllCommands( *pi->m_pDifficultyMeter, m_sName ); - /* Position it in LoadNextSong. */ - this->AddChild( pi->m_pDifficultyMeter ); - // switch( GAMESTATE->m_PlayMode ) // { // case PLAY_MODE_BATTLE: @@ -1077,12 +1067,6 @@ void ScreenGameplay::LoadNextSong() if( pi->m_pDifficultyIcon ) pi->m_pDifficultyIcon->SetFromSteps( pi->GetStepsAndTrailIndex(), pSteps ); - if( pi->m_pDifficultyMeter ) - { - pi->m_pDifficultyMeter->SetName( m_sName + ssprintf(" DifficultyMeter%s",pi->GetName().c_str()) ); - pi->m_pDifficultyMeter->SetFromSteps( pSteps ); - } - /* The actual note data for scoring is the base class of Player. This includes * transforms, like Wide. Otherwise, the scoring will operate on the wrong data. */ if( pi->m_pPrimaryScoreKeeper ) @@ -1133,12 +1117,6 @@ void ScreenGameplay::LoadNextSong() pi->m_pDifficultyIcon->SetName( ssprintf("Difficulty%s%s",pi->GetName().c_str(),bReverse?"Reverse":"") ); LOAD_ALL_COMMANDS_AND_SET_XY( pi->m_pDifficultyIcon ); } - - if( pi->m_pDifficultyMeter ) - { - pi->m_pDifficultyMeter->SetName( ssprintf("DifficultyMeter%s%s",pi->GetName().c_str(),bReverse?"Reverse":"") ); - LOAD_ALL_COMMANDS_AND_SET_XY( pi->m_pDifficultyMeter ); - } } diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 41bbd92dd8..93824ee9c1 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -28,7 +28,6 @@ class Player; class LifeMeter; class ScoreDisplay; class DifficultyIcon; -class DifficultyMeter; class Inventory; class ScoreKeeper; class Background; @@ -97,7 +96,6 @@ public: Inventory *m_pInventory; DifficultyIcon *m_pDifficultyIcon; - DifficultyMeter *m_pDifficultyMeter; AutoActor m_sprOniGameOver; };