From 020d263cdd6e89d4592a450b0c00fabe7b3b89c3 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 11 Jul 2006 16:55:38 +0000 Subject: [PATCH] remove unused "BeginnerLabel" --- stepmania/src/Judgment.cpp | 6 +++--- stepmania/src/Judgment.h | 2 +- stepmania/src/Player.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Judgment.cpp b/stepmania/src/Judgment.cpp index 390bfd800d..db87373847 100644 --- a/stepmania/src/Judgment.cpp +++ b/stepmania/src/Judgment.cpp @@ -22,9 +22,9 @@ Judgment::Judgment() m_mpToTrack = MultiPlayer_INVALID; } -void Judgment::LoadNormal( bool bBeginner ) +void Judgment::LoadNormal() { - m_sprJudgment.Load( THEME->GetPathG("Judgment",bBeginner?"BeginnerLabel":"label") ); + m_sprJudgment.Load( THEME->GetPathG("Judgment","label") ); ASSERT( m_sprJudgment.GetNumStates() == 6 || m_sprJudgment.GetNumStates() == 12 ); m_sprJudgment.StopAnimating(); Reset(); @@ -83,7 +83,7 @@ void Judgment::SetJudgment( TapNoteScore score, bool bEarly ) void Judgment::LoadFromMultiPlayer( MultiPlayer mp ) { - LoadNormal( false ); + LoadNormal(); ASSERT( m_mpToTrack == MultiPlayer_INVALID ); // assert only load once m_mpToTrack = mp; this->SubscribeToMessage( enum_add2(Message_ShowJudgmentMuliPlayerP1,m_mpToTrack) ); diff --git a/stepmania/src/Judgment.h b/stepmania/src/Judgment.h index 487b7b6c41..426f3dc70e 100644 --- a/stepmania/src/Judgment.h +++ b/stepmania/src/Judgment.h @@ -13,7 +13,7 @@ class Judgment : public ActorFrame public: Judgment(); virtual Actor *Copy() const; - void LoadNormal( bool bAlternateLabel ); + void LoadNormal(); void LoadFromMultiPlayer( MultiPlayer mp ); void Reset(); void SetJudgment( TapNoteScore score, bool bEarly ); diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index b185cd95b5..fffa6ec8a5 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -300,7 +300,7 @@ void Player::Init( if( m_pJudgment ) { m_pJudgment->SetName( "Judgment" ); - m_pJudgment->LoadNormal( IsPlayingBeginner() ); + m_pJudgment->LoadNormal(); ActorUtil::OnCommand( m_pJudgment, sType ); }