From 2d2708157370139c53f5ea8bbd52e71413db15c9 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 4 Jul 2005 21:47:16 +0000
Subject: [PATCH] do this with lua

---
 stepmania/src/HoldJudgment.cpp | 10 ----------
 stepmania/src/HoldJudgment.h   |  1 -
 stepmania/src/Judgment.cpp     | 24 ------------------------
 stepmania/src/Judgment.h       |  1 -
 4 files changed, 36 deletions(-)

diff --git a/stepmania/src/HoldJudgment.cpp b/stepmania/src/HoldJudgment.cpp
index e077dea083..54ae8a3f1b 100644
--- a/stepmania/src/HoldJudgment.cpp
+++ b/stepmania/src/HoldJudgment.cpp
@@ -7,16 +7,10 @@
 
 ThemeMetric<apActorCommands>	OK_COMMAND	("HoldJudgment","OKCommand");
 ThemeMetric<apActorCommands>	NG_COMMAND	("HoldJudgment","NGCommand");
-ThemeMetric<apActorCommands>	OK_ODD_COMMAND	("HoldJudgment","OKOddCommand");
-ThemeMetric<apActorCommands>	NG_ODD_COMMAND	("HoldJudgment","NGOddCommand");
-ThemeMetric<apActorCommands>	OK_EVEN_COMMAND	("HoldJudgment","OKEvenCommand");
-ThemeMetric<apActorCommands>	NG_EVEN_COMMAND	("HoldJudgment","NGEvenCommand");
 
 
 HoldJudgment::HoldJudgment()
 {
-	m_iCount = 0;
-
 	m_sprJudgment.Load( THEME->GetPathG("HoldJudgment","label 1x2") );
 	m_sprJudgment.StopAnimating();
 	Reset();
@@ -43,19 +37,15 @@ void HoldJudgment::SetHoldJudgment( HoldNoteScore hns )
 		ASSERT(0);
 	case HNS_OK:
 		m_sprJudgment.SetState( 0 );
-		m_sprJudgment.RunCommands( (m_iCount%2) ? OK_ODD_COMMAND : OK_EVEN_COMMAND );
 		m_sprJudgment.RunCommands( OK_COMMAND );
 		break;
 	case HNS_NG:
 		m_sprJudgment.SetState( 1 );
-		m_sprJudgment.RunCommands( (m_iCount%2) ? NG_ODD_COMMAND : NG_EVEN_COMMAND );
 		m_sprJudgment.RunCommands( NG_COMMAND );
 		break;
 	default:
 		ASSERT(0);
 	}
-
-	m_iCount++;
 }
 
 /*
diff --git a/stepmania/src/HoldJudgment.h b/stepmania/src/HoldJudgment.h
index 7e2fd52a17..75088740f4 100644
--- a/stepmania/src/HoldJudgment.h
+++ b/stepmania/src/HoldJudgment.h
@@ -16,7 +16,6 @@ public:
 
 protected:
 	Sprite		m_sprJudgment;
-	int			m_iCount;
 };
 
 #endif
diff --git a/stepmania/src/Judgment.cpp b/stepmania/src/Judgment.cpp
index a3bff301a5..f147881ea1 100644
--- a/stepmania/src/Judgment.cpp
+++ b/stepmania/src/Judgment.cpp
@@ -13,24 +13,8 @@ static ThemeMetric<apActorCommands>	GOOD_COMMAND			("Judgment","GoodCommand");
 static ThemeMetric<apActorCommands>	BOO_COMMAND				("Judgment","BooCommand");
 static ThemeMetric<apActorCommands>	MISS_COMMAND			("Judgment","MissCommand");
 
-static ThemeMetric<apActorCommands>	MARVELOUS_ODD_COMMAND	("Judgment","MarvelousOddCommand");
-static ThemeMetric<apActorCommands>	PERFECT_ODD_COMMAND		("Judgment","PerfectOddCommand");
-static ThemeMetric<apActorCommands>	GREAT_ODD_COMMAND		("Judgment","GreatOddCommand");
-static ThemeMetric<apActorCommands>	GOOD_ODD_COMMAND		("Judgment","GoodOddCommand");
-static ThemeMetric<apActorCommands>	BOO_ODD_COMMAND			("Judgment","BooOddCommand");
-static ThemeMetric<apActorCommands>	MISS_ODD_COMMAND		("Judgment","MissOddCommand");
-
-static ThemeMetric<apActorCommands>	MARVELOUS_EVEN_COMMAND	("Judgment","MarvelousEvenCommand");
-static ThemeMetric<apActorCommands>	PERFECT_EVEN_COMMAND	("Judgment","PerfectEvenCommand");
-static ThemeMetric<apActorCommands>	GREAT_EVEN_COMMAND		("Judgment","GreatEvenCommand");
-static ThemeMetric<apActorCommands>	GOOD_EVEN_COMMAND		("Judgment","GoodEvenCommand");
-static ThemeMetric<apActorCommands>	BOO_EVEN_COMMAND		("Judgment","BooEvenCommand");
-static ThemeMetric<apActorCommands>	MISS_EVEN_COMMAND		("Judgment","MissEvenCommand");
-
-
 Judgment::Judgment()
 {
-	m_iCount = 0;
 }
 
 void Judgment::Load( bool bBeginner )
@@ -66,39 +50,31 @@ void Judgment::SetJudgment( TapNoteScore score, bool bEarly )
 	{
 	case TNS_MARVELOUS:
 		m_sprJudgment.SetState( 0 * iStateMult + iStateAdd );
-		m_sprJudgment.RunCommands( (m_iCount%2) ? MARVELOUS_ODD_COMMAND : MARVELOUS_EVEN_COMMAND );
 		m_sprJudgment.RunCommands( MARVELOUS_COMMAND );
 		break;
 	case TNS_PERFECT:
 		m_sprJudgment.SetState( 1 * iStateMult + iStateAdd );
-		m_sprJudgment.RunCommands( (m_iCount%2) ? PERFECT_ODD_COMMAND : PERFECT_EVEN_COMMAND );
 		m_sprJudgment.RunCommands( PERFECT_COMMAND );
 		break;
 	case TNS_GREAT:
 		m_sprJudgment.SetState( 2 * iStateMult + iStateAdd );
-		m_sprJudgment.RunCommands( (m_iCount%2) ? GREAT_ODD_COMMAND : GREAT_EVEN_COMMAND );
 		m_sprJudgment.RunCommands( GREAT_COMMAND );
 		break;
 	case TNS_GOOD:
 		m_sprJudgment.SetState( 3 * iStateMult + iStateAdd );
-		m_sprJudgment.RunCommands( (m_iCount%2) ? GOOD_ODD_COMMAND : GOOD_EVEN_COMMAND );
 		m_sprJudgment.RunCommands( GOOD_COMMAND );
 		break;
 	case TNS_BOO:
 		m_sprJudgment.SetState( 4 * iStateMult + iStateAdd );
-		m_sprJudgment.RunCommands( (m_iCount%2) ? BOO_ODD_COMMAND : BOO_EVEN_COMMAND );
 		m_sprJudgment.RunCommands( BOO_COMMAND );
 		break;
 	case TNS_MISS:
 		m_sprJudgment.SetState( 5 * iStateMult + iStateAdd );
-		m_sprJudgment.RunCommands( (m_iCount%2) ? MISS_ODD_COMMAND : MISS_EVEN_COMMAND );
 		m_sprJudgment.RunCommands( MISS_COMMAND );
 		break;
 	default:
 		ASSERT(0);
 	}
-
-	m_iCount++;
 }
 
 /*
diff --git a/stepmania/src/Judgment.h b/stepmania/src/Judgment.h
index 2d48a96452..bf3de4298a 100644
--- a/stepmania/src/Judgment.h
+++ b/stepmania/src/Judgment.h
@@ -18,7 +18,6 @@ public:
 
 protected:
 	Sprite		m_sprJudgment;
-	int			m_iCount;
 };
 
 #endif