From 0532a3db79a74f59884474e1d868ec8fd77125f3 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 7 Jul 2005 10:48:02 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/BGAnimationLayer.cpp |  5 -----
 stepmania/src/BGAnimationLayer.h   |  1 -
 stepmania/src/BPMDisplay.cpp       |  5 -----
 stepmania/src/BPMDisplay.h         |  2 +-
 stepmania/src/OptionIcon.cpp       |  5 -----
 stepmania/src/OptionIcon.h         |  1 -
 stepmania/src/OptionIconRow.cpp    |  7 +------
 stepmania/src/OptionIconRow.h      |  1 -
 stepmania/src/WheelBase.cpp        | 20 --------------------
 9 files changed, 2 insertions(+), 45 deletions(-)

diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp
index 05a411a455..802e666676 100644
--- a/stepmania/src/BGAnimationLayer.cpp
+++ b/stepmania/src/BGAnimationLayer.cpp
@@ -672,11 +672,6 @@ bool BGAnimationLayer::EarlyAbortDraw()
 	return false;
 }
 
-void BGAnimationLayer::DrawPrimitives()
-{
-	ActorFrame::DrawPrimitives();
-}
-
 
 /*
  * (c) 2001-2004 Ben Nordstrom, Chris Danford, Glenn Maynard
diff --git a/stepmania/src/BGAnimationLayer.h b/stepmania/src/BGAnimationLayer.h
index d08bd56201..e7b709fdf5 100644
--- a/stepmania/src/BGAnimationLayer.h
+++ b/stepmania/src/BGAnimationLayer.h
@@ -21,7 +21,6 @@ public:
 	void LoadFromNode( const CString& sDir, const XNode* pNode );
 
 	void UpdateInternal( float fDeltaTime );
-	void DrawPrimitives();
 	bool EarlyAbortDraw();
 
 	float GetMaxTweenTimeLeft() const;
diff --git a/stepmania/src/BPMDisplay.cpp b/stepmania/src/BPMDisplay.cpp
index f5dc79e333..b7f6a51112 100644
--- a/stepmania/src/BPMDisplay.cpp
+++ b/stepmania/src/BPMDisplay.cpp
@@ -227,11 +227,6 @@ void BPMDisplay::SetVarious()
 	m_textBPM.SetText( "Various" );
 }
 
-void BPMDisplay::DrawPrimitives()
-{
-	ActorFrame::DrawPrimitives();
-}
-
 /*
  * (c) 2001-2002 Chris Danford
  * All rights reserved.
diff --git a/stepmania/src/BPMDisplay.h b/stepmania/src/BPMDisplay.h
index 9add287774..5602c97529 100644
--- a/stepmania/src/BPMDisplay.h
+++ b/stepmania/src/BPMDisplay.h
@@ -19,7 +19,7 @@ public:
 	BPMDisplay();
 	void Load();
 	virtual void Update( float fDeltaTime ); 
-	virtual void DrawPrimitives(); 
+
 	void SetBpmFromSong( const Song* pSong );
 	void SetBpmFromCourse( const Course* pCourse );
 	void SetConstantBpm( float fBPM );
diff --git a/stepmania/src/OptionIcon.cpp b/stepmania/src/OptionIcon.cpp
index 54ee4e4193..212f1cb01e 100644
--- a/stepmania/src/OptionIcon.cpp
+++ b/stepmania/src/OptionIcon.cpp
@@ -64,11 +64,6 @@ void OptionIcon::Set( PlayerNumber pn, const CString &_sText, bool bHeader )
 	m_text.CropToWidth( TEXT_WIDTH );
 }
 
-void OptionIcon::DrawPrimitives()
-{
-	ActorFrame::DrawPrimitives();
-}
-
 /*
  * (c) 2002-2004 Chris Danford
  * All rights reserved.
diff --git a/stepmania/src/OptionIcon.h b/stepmania/src/OptionIcon.h
index a5166f4956..154531789f 100644
--- a/stepmania/src/OptionIcon.h
+++ b/stepmania/src/OptionIcon.h
@@ -15,7 +15,6 @@ public:
 	OptionIcon();
 	void Load( CString sType );
 	void Set( PlayerNumber pn, const CString &sText, bool bHeader = false );
-	void DrawPrimitives();
 
 protected:
 	BitmapText	m_text;
diff --git a/stepmania/src/OptionIconRow.cpp b/stepmania/src/OptionIconRow.cpp
index a4700c36d8..2ff963df87 100644
--- a/stepmania/src/OptionIconRow.cpp
+++ b/stepmania/src/OptionIconRow.cpp
@@ -28,7 +28,7 @@ struct OptionColumnEntry
 	int iSlotIndex;
 };
 
-const OptionColumnEntry g_OptionColumnEntries[] =
+static const OptionColumnEntry g_OptionColumnEntries[] =
 {
 	{"Boost",		0},
 	{"Brake",		0},
@@ -132,11 +132,6 @@ void OptionIconRow::Refresh()
 			m_OptionIcon[i].Set( m_PlayerNumber, asTabs[i-1], false );		
 }
 
-void OptionIconRow::DrawPrimitives()
-{
-	ActorFrame::DrawPrimitives();
-}
-
 /*
  * (c) 2002-2004 Chris Danford
  * All rights reserved.
diff --git a/stepmania/src/OptionIconRow.h b/stepmania/src/OptionIconRow.h
index 343b413671..eb5f529b2e 100644
--- a/stepmania/src/OptionIconRow.h
+++ b/stepmania/src/OptionIconRow.h
@@ -19,7 +19,6 @@ public:
 
 	void Load( PlayerNumber pn );
 	void Refresh();
-	virtual void DrawPrimitives();
 
 protected:
 	PlayerNumber	m_PlayerNumber;
diff --git a/stepmania/src/WheelBase.cpp b/stepmania/src/WheelBase.cpp
index 697e73ccd0..c426f54e96 100644
--- a/stepmania/src/WheelBase.cpp
+++ b/stepmania/src/WheelBase.cpp
@@ -148,33 +148,13 @@ void WheelBase::SetItemPosition( Actor &item, float fPosOffsetsFromMiddle )
 
 void WheelBase::DrawPrimitives()
 {
-	if( USE_3D )
-	{
-//		DISPLAY->PushMatrix();
-//		DISPLAY->EnterPerspective(45, false);  //Not needed for 3D
-
-		// construct view and project matrix
-//		RageVector3 Up( 0.0f, 1.0f, 0.0f );
-//		RageVector3 Eye( SCREEN_CENTER_X, SCREEN_CENTER_Y, 550 );
-//		RageVector3 At( SCREEN_CENTER_X, SCREEN_CENTER_Y, 0 );
-
-//		DISPLAY->LoadLookAt(60, Eye, At, Up); //Changed from DISPLAY->LookAt(Eye, At, Up)
-	}
-
 	// draw outside->inside
 	for( int i=0; i<NUM_WHEEL_ITEMS/2; i++ )
 		DrawItem( i );
 	for( int i=NUM_WHEEL_ITEMS-1; i>=NUM_WHEEL_ITEMS/2; i-- )
 		DrawItem( i );
 
-
 	ActorFrame::DrawPrimitives();
-	
-	if( USE_3D )
-	{
-//		DISPLAY->ExitPerspective(); //Not needed?
-//		DISPLAY->PopMatrix();
-	}
 }