From f2e89da41504677c2d1fbfe4f3d46daa3b0acfa3 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 20 Oct 2006 00:22:16 +0000
Subject: [PATCH] cleanups

---
 stepmania/src/ComboGraph.cpp      | 2 +-
 stepmania/src/ScreenTextEntry.cpp | 2 +-
 stepmania/src/WheelBase.cpp       | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/ComboGraph.cpp b/stepmania/src/ComboGraph.cpp
index ed94486524..4ac22664b0 100644
--- a/stepmania/src/ComboGraph.cpp
+++ b/stepmania/src/ComboGraph.cpp
@@ -83,7 +83,7 @@ void ComboGraph::Load( const StageStats &s, const PlayerStageStats &pss )
 		if( !bIsMax )
 			continue;
 
-		BitmapText *pText = dynamic_cast<BitmapText*>( m_pMaxComboText->Copy() ); // XXX Copy should be covariant
+		BitmapText *pText = m_pMaxComboText->Copy();
 
 		const float fStart = SCALE( combo.fStartSecond, fFirstSecond, fLastSecond, 0.0f, 1.0f );
 		const float fSize = SCALE( combo.fSizeSeconds, 0, fLastSecond-fFirstSecond, 0.0f, 1.0f );
diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index baffeafbab..da7959343a 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -325,7 +325,7 @@ void ScreenTextEntryVisual::Init()
 			for( int x=0; x<KEYS_PER_ROW; ++x )
 			{
 				BitmapText *&pbt = m_ptextKeys[r][x];
-				pbt = dynamic_cast<BitmapText *>( text.Copy() ); // XXX: Copy() should be covariant
+				pbt = text.Copy();
 				this->AddChild( pbt );
 
 				RString s = g_szKeys[r][x];
diff --git a/stepmania/src/WheelBase.cpp b/stepmania/src/WheelBase.cpp
index e68551039a..344b1f373d 100644
--- a/stepmania/src/WheelBase.cpp
+++ b/stepmania/src/WheelBase.cpp
@@ -60,8 +60,7 @@ void WheelBase::Load( RString sType )
 	ActorUtil::LoadAllCommands( *pTempl, m_sName );
 	for( int i=0; i<NUM_WHEEL_ITEMS; i++ )
 	{
-		Actor *pActor = pTempl->Copy();
-		WheelItemBase *pItem = dynamic_cast<WheelItemBase *>( pActor ); // XXX: ugly cast
+		WheelItemBase *pItem = pTempl->Copy();
 		DEBUG_ASSERT( pItem );
 		m_WheelBaseItems.push_back( pItem );
 	}