actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove unused "BeginnerLabel"

Browse Source
This commit is contained in:
Glenn Maynard
2006-07-11 16:55:38 +00:00
parent cd8266eb76
commit 020d263cdd
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Judgment.cpp
+3 -3
View File
@@ -22,9 +22,9 @@ Judgment::Judgment()
m_mpToTrack = MultiPlayer_INVALID; 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 ); ASSERT( m_sprJudgment.GetNumStates() == 6 || m_sprJudgment.GetNumStates() == 12 );
m_sprJudgment.StopAnimating(); m_sprJudgment.StopAnimating();
Reset(); Reset();
@@ -83,7 +83,7 @@ void Judgment::SetJudgment( TapNoteScore score, bool bEarly )
void Judgment::LoadFromMultiPlayer( MultiPlayer mp ) void Judgment::LoadFromMultiPlayer( MultiPlayer mp )
{ {
LoadNormal( false ); LoadNormal();
ASSERT( m_mpToTrack == MultiPlayer_INVALID ); // assert only load once ASSERT( m_mpToTrack == MultiPlayer_INVALID ); // assert only load once
m_mpToTrack = mp; m_mpToTrack = mp;
this->SubscribeToMessage( enum_add2(Message_ShowJudgmentMuliPlayerP1,m_mpToTrack) ); this->SubscribeToMessage( enum_add2(Message_ShowJudgmentMuliPlayerP1,m_mpToTrack) );
stepmania/src/Judgment.h
+1 -1
View File
@@ -13,7 +13,7 @@ class Judgment : public ActorFrame
public: public:
Judgment(); Judgment();
virtual Actor *Copy() const; virtual Actor *Copy() const;
void LoadNormal( bool bAlternateLabel ); void LoadNormal();
void LoadFromMultiPlayer( MultiPlayer mp ); void LoadFromMultiPlayer( MultiPlayer mp );
void Reset(); void Reset();
void SetJudgment( TapNoteScore score, bool bEarly ); void SetJudgment( TapNoteScore score, bool bEarly );
stepmania/src/Player.cpp
+1 -1
View File
@@ -300,7 +300,7 @@ void Player::Init(
if( m_pJudgment ) if( m_pJudgment )
{ {
m_pJudgment->SetName( "Judgment" ); m_pJudgment->SetName( "Judgment" );
m_pJudgment->LoadNormal( IsPlayingBeginner() ); m_pJudgment->LoadNormal();
ActorUtil::OnCommand( m_pJudgment, sType ); ActorUtil::OnCommand( m_pJudgment, sType );
} }