From 35847c32c57f2e9b7e903595b12d6dfb56d31973 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 12 Jan 2004 01:43:38 +0000
Subject: [PATCH] simplify

---
 stepmania/src/MeterDisplay.cpp | 18 +++---------------
 stepmania/src/MeterDisplay.h   | 10 ++++------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/stepmania/src/MeterDisplay.cpp b/stepmania/src/MeterDisplay.cpp
index c00cad6083..248a177180 100644
--- a/stepmania/src/MeterDisplay.cpp
+++ b/stepmania/src/MeterDisplay.cpp
@@ -14,31 +14,19 @@
 
 MeterDisplay::MeterDisplay()
 {
-
+	this->AddChild( &m_sprStream );
 }
 
-void MeterDisplay::Load( CString sSteamPath, float fStreamWidth )
+void MeterDisplay::Load( CString sStreamPath, float fStreamWidth )
 {
 	m_fStreamWidth = fStreamWidth;
 
-	m_sprStream.Load( sSteamPath );
+	m_sprStream.Load( sStreamPath );
 	m_sprStream.SetZoomX( fStreamWidth / m_sprStream.GetUnzoomedWidth() );
 
 	SetPercent( 0.5f );
 }
 
-void MeterDisplay::Update( float fDelta )
-{
-	m_sprStream.Update( fDelta );
-
-	Actor::Update( fDelta );
-}
-
-void MeterDisplay::DrawPrimitives()
-{
-	m_sprStream.Draw();
-}
-
 void MeterDisplay::SetPercent( float fPercent )
 {
 	ASSERT( fPercent >= 0 && fPercent <= 1 );
diff --git a/stepmania/src/MeterDisplay.h b/stepmania/src/MeterDisplay.h
index 4c3518c717..2b094c4d03 100644
--- a/stepmania/src/MeterDisplay.h
+++ b/stepmania/src/MeterDisplay.h
@@ -11,22 +11,20 @@
 -----------------------------------------------------------------------------
 */
 
-#include "Actor.h"
+#include "ActorFrame.h"
 #include "Sprite.h"
 #include "Quad.h"
 
 
-class MeterDisplay : public Actor
+class MeterDisplay : public ActorFrame
 {
 public:
 	MeterDisplay();
-	void Load( CString sSteamPath, float fStreamWidth );
-	virtual void Update( float fDelta );
-	virtual void DrawPrimitives();
+	void Load( CString sStreamPath, float fStreamWidth );
 
 	void SetPercent( float fPercent );
 
-
+private:
 	float	m_fStreamWidth;
 	float	m_fPercent;
 	Sprite  m_sprStream;