From ac55b2d24f7c0bfe7dcd14e132f311dc137f7762 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 5 May 2005 02:48:46 +0000
Subject: [PATCH] split out DrawGrayBar protected:

---
 stepmania/src/WheelItemBase.cpp | 21 +++++++++++++--------
 stepmania/src/WheelItemBase.h   |  3 ++-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/stepmania/src/WheelItemBase.cpp b/stepmania/src/WheelItemBase.cpp
index 226ace80a6..2bdefd08d8 100644
--- a/stepmania/src/WheelItemBase.cpp
+++ b/stepmania/src/WheelItemBase.cpp
@@ -79,18 +79,23 @@ void WheelItemBase::Update( float fDeltaTime )
 	Actor::Update( fDeltaTime );
 }
 
+void WheelItemBase::DrawGrayBar( Sprite& bar )
+{
+	if( m_fPercentGray == 0 )
+		return;
+
+	bar.SetGlow( RageColor(0,0,0,m_fPercentGray) );
+	bar.SetDiffuse( RageColor(0,0,0,0) );
+	bar.Draw();
+	bar.SetDiffuse( RageColor(0,0,0,1) );
+	bar.SetGlow( RageColor(0,0,0,0) );
+}
+
 void WheelItemBase::DrawPrimitives(Sprite& bar)
 {
 	ActorFrame::DrawPrimitives();
 
-	if( m_fPercentGray > 0 )
-	{
-		bar.SetGlow( RageColor(0,0,0,m_fPercentGray) );
-		bar.SetDiffuse( RageColor(0,0,0,0) );
-		bar.Draw();
-		bar.SetDiffuse( RageColor(0,0,0,1) );
-		bar.SetGlow( RageColor(0,0,0,0) );
-	}
+	DrawGrayBar( bar );
 }
   
 /*
diff --git a/stepmania/src/WheelItemBase.h b/stepmania/src/WheelItemBase.h
index 8f35372b68..b77e81609b 100644
--- a/stepmania/src/WheelItemBase.h
+++ b/stepmania/src/WheelItemBase.h
@@ -35,11 +35,13 @@ public:
 	virtual void DrawPrimitives() { DrawPrimitives( m_sprBar ); }
 	
 	void Load( CString sType );
+	void DrawGrayBar( Sprite& bar );
 
 	virtual void LoadFromWheelItemBaseData( WheelItemBaseData* pWID );
 
 	float				m_fPercentGray;
 
+protected:
 	Sprite	m_sprBar;
 	BitmapText m_text;
 	WheelItemType m_Type;
@@ -49,7 +51,6 @@ public:
 	ThemeMetric<float>				TEXT_Y;
 	ThemeMetric<float>				TEXT_WIDTH;
 	ThemeMetric<apActorCommands>	TEXT_ON_COMMAND;
-
 };
 
 struct WheelItemBaseData