fix name conflict between HoldJudgment::Reset and Actor::Reset

This commit is contained in:
Glenn Maynard
2005-10-05 22:03:47 +00:00
parent d78b194f09
commit 9f8e27442c
+3 -3
View File
@@ -13,11 +13,11 @@ HoldJudgment::HoldJudgment()
{ {
m_sprJudgment.Load( THEME->GetPathG("HoldJudgment","label 1x2") ); m_sprJudgment.Load( THEME->GetPathG("HoldJudgment","label 1x2") );
m_sprJudgment.StopAnimating(); m_sprJudgment.StopAnimating();
Reset(); ResetAnimation();
this->AddChild( &m_sprJudgment ); this->AddChild( &m_sprJudgment );
} }
void HoldJudgment::Reset() void HoldJudgment::ResetAnimation()
{ {
m_sprJudgment.SetDiffuse( RageColor(1,1,1,0) ); m_sprJudgment.SetDiffuse( RageColor(1,1,1,0) );
m_sprJudgment.SetXY( 0, 0 ); m_sprJudgment.SetXY( 0, 0 );
@@ -29,7 +29,7 @@ void HoldJudgment::SetHoldJudgment( HoldNoteScore hns )
{ {
//LOG->Trace( "Judgment::SetJudgment()" ); //LOG->Trace( "Judgment::SetJudgment()" );
Reset(); ResetAnimation();
switch( hns ) switch( hns )
{ {