From 9f8e27442c644f856eb4c8ae1130ebe513095771 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 5 Oct 2005 22:03:47 +0000
Subject: [PATCH] fix name conflict between HoldJudgment::Reset and
 Actor::Reset

---
 stepmania/src/HoldJudgment.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/HoldJudgment.cpp b/stepmania/src/HoldJudgment.cpp
index 02e665aa3a..c445f6d034 100644
--- a/stepmania/src/HoldJudgment.cpp
+++ b/stepmania/src/HoldJudgment.cpp
@@ -13,11 +13,11 @@ HoldJudgment::HoldJudgment()
 {
 	m_sprJudgment.Load( THEME->GetPathG("HoldJudgment","label 1x2") );
 	m_sprJudgment.StopAnimating();
-	Reset();
+	ResetAnimation();
 	this->AddChild( &m_sprJudgment );
 }
 
-void HoldJudgment::Reset()
+void HoldJudgment::ResetAnimation()
 {
 	m_sprJudgment.SetDiffuse( RageColor(1,1,1,0) );
 	m_sprJudgment.SetXY( 0, 0 );
@@ -29,7 +29,7 @@ void HoldJudgment::SetHoldJudgment( HoldNoteScore hns )
 {
 	//LOG->Trace( "Judgment::SetJudgment()" );
 
-	Reset();
+	ResetAnimation();
 
 	switch( hns )
 	{