From 28133ca105f05a4c6cfbe7c7b546122722ce3715 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 7 Jul 2005 10:29:04 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/ScreenEvaluation.cpp          |  5 -----
 stepmania/src/ScreenEvaluation.h            |  1 -
 stepmania/src/ScreenEz2SelectMusic.cpp      |  5 -----
 stepmania/src/ScreenEz2SelectMusic.h        |  1 -
 stepmania/src/ScreenEz2SelectPlayer.cpp     | 10 ----------
 stepmania/src/ScreenEz2SelectPlayer.h       |  1 -
 stepmania/src/ScreenGameplayMultiplayer.cpp |  6 ------
 stepmania/src/ScreenGameplayMultiplayer.h   |  1 -
 stepmania/src/ScreenMapControllers.cpp      |  5 -----
 stepmania/src/ScreenMapControllers.h        |  1 -
 stepmania/src/ScreenOptions.cpp             |  5 -----
 stepmania/src/ScreenOptions.h               |  1 -
 stepmania/src/ScreenSelectCharacter.cpp     |  5 -----
 stepmania/src/ScreenSelectCharacter.h       |  1 -
 stepmania/src/ScreenSelectGroup.cpp         |  5 -----
 stepmania/src/ScreenSelectGroup.h           |  1 -
 stepmania/src/ScreenSetTime.cpp             |  5 -----
 stepmania/src/ScreenSetTime.h               |  1 -
 stepmania/src/ScreenTestInput.cpp           |  5 -----
 stepmania/src/ScreenTestInput.h             |  1 -
 stepmania/src/ScreenTestLights.cpp          |  5 -----
 stepmania/src/ScreenTestLights.h            |  1 -
 stepmania/src/ScreenTextEntry.cpp           | 10 ----------
 stepmania/src/ScreenTextEntry.h             |  2 --
 24 files changed, 84 deletions(-)

diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index a459dc1a39..51918864d7 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -1268,11 +1268,6 @@ void ScreenEvaluation::Update( float fDeltaTime )
 	}
 }
 
-void ScreenEvaluation::DrawPrimitives()
-{
-	ScreenWithMenuElements::DrawPrimitives();
-}
-
 void ScreenEvaluation::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
 //	LOG->Trace( "ScreenEvaluation::Input()" );
diff --git a/stepmania/src/ScreenEvaluation.h b/stepmania/src/ScreenEvaluation.h
index 280d960b61..fcff036ed7 100644
--- a/stepmania/src/ScreenEvaluation.h
+++ b/stepmania/src/ScreenEvaluation.h
@@ -35,7 +35,6 @@ public:
 	ScreenEvaluation( CString sClassName );
 	virtual void Init();
 	virtual void Update( float fDeltaTime );
-	virtual void DrawPrimitives();
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index 4a0f5525ac..bb866dd0eb 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -512,11 +512,6 @@ void ScreenEz2SelectMusic::Update( float fDeltaTime )
 	Screen::Update( fDeltaTime );
 }
 
-void ScreenEz2SelectMusic::DrawPrimitives()
-{
-	Screen::DrawPrimitives();
-}
-
 void ScreenEz2SelectMusic::EasierDifficulty( PlayerNumber pn )
 {
 	if(USE_MODE_SWITCHER == 1)
diff --git a/stepmania/src/ScreenEz2SelectMusic.h b/stepmania/src/ScreenEz2SelectMusic.h
index 13a82c4bab..3e3f5bc92a 100644
--- a/stepmania/src/ScreenEz2SelectMusic.h
+++ b/stepmania/src/ScreenEz2SelectMusic.h
@@ -16,7 +16,6 @@ class ScreenEz2SelectMusic : public ScreenWithMenuElements
 public:
 	ScreenEz2SelectMusic( CString sName );
 	virtual void Init();
-	virtual void DrawPrimitives();
 
 	virtual void Update( float fDeltaTime );
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp
index 6393c8770b..26c5add1af 100644
--- a/stepmania/src/ScreenEz2SelectPlayer.cpp
+++ b/stepmania/src/ScreenEz2SelectPlayer.cpp
@@ -109,16 +109,6 @@ void ScreenEz2SelectPlayer::Update( float fDeltaTime )
 	Screen::Update( fDeltaTime );
 }
 
-/************************************
-DrawPrimitives
-Desc: Draws the screen =P
-************************************/
-
-void ScreenEz2SelectPlayer::DrawPrimitives()
-{
-	Screen::DrawPrimitives();
-}
-
 /************************************
 Input
 Desc: Handles player input.
diff --git a/stepmania/src/ScreenEz2SelectPlayer.h b/stepmania/src/ScreenEz2SelectPlayer.h
index 708b0901cd..bac7783285 100644
--- a/stepmania/src/ScreenEz2SelectPlayer.h
+++ b/stepmania/src/ScreenEz2SelectPlayer.h
@@ -16,7 +16,6 @@ public:
 	
 	/* Public Function Prototypes */
 	virtual void Update( float fDeltaTime );
-	virtual void DrawPrimitives();
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
diff --git a/stepmania/src/ScreenGameplayMultiplayer.cpp b/stepmania/src/ScreenGameplayMultiplayer.cpp
index 0982f79043..5b937c3cc6 100644
--- a/stepmania/src/ScreenGameplayMultiplayer.cpp
+++ b/stepmania/src/ScreenGameplayMultiplayer.cpp
@@ -492,12 +492,6 @@ void ScreenGameplayMultiplayer::Update( float fDeltaTime )
 }
 
 
-void ScreenGameplayMultiplayer::DrawPrimitives()
-{
-	Screen::DrawPrimitives();
-}
-
-
 void ScreenGameplayMultiplayer::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
 	//LOG->Trace( "ScreenGameplayMultiplayer::Input()" );
diff --git a/stepmania/src/ScreenGameplayMultiplayer.h b/stepmania/src/ScreenGameplayMultiplayer.h
index 73096343c5..6f4b709b87 100644
--- a/stepmania/src/ScreenGameplayMultiplayer.h
+++ b/stepmania/src/ScreenGameplayMultiplayer.h
@@ -47,7 +47,6 @@ public:
 	virtual ~ScreenGameplayMultiplayer();
 
 	virtual void Update( float fDeltaTime );
-	virtual void DrawPrimitives();
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index 7b12eb5bc8..55b718dd7d 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -140,11 +140,6 @@ void ScreenMapControllers::Update( float fDeltaTime )
 }
 
 
-void ScreenMapControllers::DrawPrimitives()
-{
-	Screen::DrawPrimitives();
-}
-
 /* Note that this isn't necessarily correct.  For example, JOY_LEFT might actually be
  * a D-pad and not an axis.  All this is actually doing is giving priority to some
  * inputs over others; this function is unsuitable for other use. */
diff --git a/stepmania/src/ScreenMapControllers.h b/stepmania/src/ScreenMapControllers.h
index b5513002eb..a05a73fd45 100644
--- a/stepmania/src/ScreenMapControllers.h
+++ b/stepmania/src/ScreenMapControllers.h
@@ -18,7 +18,6 @@ public:
 	virtual ~ScreenMapControllers();
 
 	virtual void Update( float fDeltaTime );
-	virtual void DrawPrimitives();
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 386c42d22e..9d41264d5c 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -469,11 +469,6 @@ void ScreenOptions::Update( float fDeltaTime )
 	ScreenWithMenuElements::Update( fDeltaTime );
 }
 
-void ScreenOptions::DrawPrimitives()
-{
-	Screen::DrawPrimitives();
-}
-
 void ScreenOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
 	/* Allow input when transitioning in (m_In.IsTransitioning()), but ignore it
diff --git a/stepmania/src/ScreenOptions.h b/stepmania/src/ScreenOptions.h
index 92f904afdf..660fdeb193 100644
--- a/stepmania/src/ScreenOptions.h
+++ b/stepmania/src/ScreenOptions.h
@@ -29,7 +29,6 @@ public:
 	void InitMenu( InputMode im, const vector<OptionRowDefinition> &vDefs, const vector<OptionRowHandler*> &vHands );
 	virtual ~ScreenOptions();
 	virtual void Update( float fDeltaTime );
-	virtual void DrawPrimitives();
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp
index 5b6c76290a..1c2578e855 100644
--- a/stepmania/src/ScreenSelectCharacter.cpp
+++ b/stepmania/src/ScreenSelectCharacter.cpp
@@ -179,11 +179,6 @@ void ScreenSelectCharacter::Input( const DeviceInput& DeviceI, const InputEventT
 	Screen::Input( DeviceI, type, GameI, MenuI, StyleI );	// default input handler
 }
 
-void ScreenSelectCharacter::DrawPrimitives()
-{
-	Screen::DrawPrimitives();
-}
-
 void ScreenSelectCharacter::HandleScreenMessage( const ScreenMessage SM )
 {
 	switch( SM )
diff --git a/stepmania/src/ScreenSelectCharacter.h b/stepmania/src/ScreenSelectCharacter.h
index cdbc0c8074..6ecc9ea25b 100644
--- a/stepmania/src/ScreenSelectCharacter.h
+++ b/stepmania/src/ScreenSelectCharacter.h
@@ -20,7 +20,6 @@ public:
 	virtual void Init();
 	virtual ~ScreenSelectCharacter();
 
-	virtual void DrawPrimitives();
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp
index ab08dc46c1..5ccb62d60b 100644
--- a/stepmania/src/ScreenSelectGroup.cpp
+++ b/stepmania/src/ScreenSelectGroup.cpp
@@ -147,11 +147,6 @@ void ScreenSelectGroup::Input( const DeviceInput& DeviceI, const InputEventType
 	Screen::Input( DeviceI, type, GameI, MenuI, StyleI );	// default input handler
 }
 
-void ScreenSelectGroup::DrawPrimitives()
-{
-	Screen::DrawPrimitives();
-}
-
 void ScreenSelectGroup::HandleScreenMessage( const ScreenMessage SM )
 {
 	switch( SM )
diff --git a/stepmania/src/ScreenSelectGroup.h b/stepmania/src/ScreenSelectGroup.h
index 4fcebf88b2..d5ada29984 100644
--- a/stepmania/src/ScreenSelectGroup.h
+++ b/stepmania/src/ScreenSelectGroup.h
@@ -17,7 +17,6 @@ public:
 	ScreenSelectGroup( CString sName );
 	virtual void Init();
 
-	virtual void DrawPrimitives();
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp
index 365b6a8029..583e5d2608 100644
--- a/stepmania/src/ScreenSetTime.cpp
+++ b/stepmania/src/ScreenSetTime.cpp
@@ -108,11 +108,6 @@ void ScreenSetTime::Update( float fDelta )
 	m_textValue[day].SetText(	ssprintf("%02d",now.tm_mday) );
 }
 
-void ScreenSetTime::DrawPrimitives()
-{
-	Screen::DrawPrimitives();
-}
-
 void ScreenSetTime::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
 	if( type != IET_FIRST_PRESS && type != IET_SLOW_REPEAT )
diff --git a/stepmania/src/ScreenSetTime.h b/stepmania/src/ScreenSetTime.h
index e5c8a70b63..cda14c0830 100644
--- a/stepmania/src/ScreenSetTime.h
+++ b/stepmania/src/ScreenSetTime.h
@@ -22,7 +22,6 @@ public:
 	virtual void Init();
 
 	virtual void Update( float fDelta );
-	virtual void DrawPrimitives();
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
 
 	virtual void MenuUp( PlayerNumber pn );
diff --git a/stepmania/src/ScreenTestInput.cpp b/stepmania/src/ScreenTestInput.cpp
index f2a208b874..08906280a7 100644
--- a/stepmania/src/ScreenTestInput.cpp
+++ b/stepmania/src/ScreenTestInput.cpp
@@ -113,11 +113,6 @@ void ScreenTestInput::Update( float fDeltaTime )
 }
 
 
-void ScreenTestInput::DrawPrimitives()
-{
-	Screen::DrawPrimitives();
-}
-
 void ScreenTestInput::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
 	if( type != IET_FIRST_PRESS && type != IET_SLOW_REPEAT )
diff --git a/stepmania/src/ScreenTestInput.h b/stepmania/src/ScreenTestInput.h
index a9754f2305..40738685b1 100644
--- a/stepmania/src/ScreenTestInput.h
+++ b/stepmania/src/ScreenTestInput.h
@@ -14,7 +14,6 @@ public:
 	virtual void Init();
 	virtual ~ScreenTestInput();
 
-	virtual void DrawPrimitives();
 	virtual void Update( float fDelta );
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
diff --git a/stepmania/src/ScreenTestLights.cpp b/stepmania/src/ScreenTestLights.cpp
index aae3033504..8a37db91e3 100644
--- a/stepmania/src/ScreenTestLights.cpp
+++ b/stepmania/src/ScreenTestLights.cpp
@@ -88,11 +88,6 @@ void ScreenTestLights::Update( float fDeltaTime )
 }
 
 
-void ScreenTestLights::DrawPrimitives()
-{
-	Screen::DrawPrimitives();
-}
-
 void ScreenTestLights::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
 	if( type != IET_FIRST_PRESS && type != IET_SLOW_REPEAT )
diff --git a/stepmania/src/ScreenTestLights.h b/stepmania/src/ScreenTestLights.h
index 8022d5267a..2659c92b73 100644
--- a/stepmania/src/ScreenTestLights.h
+++ b/stepmania/src/ScreenTestLights.h
@@ -12,7 +12,6 @@ public:
 	virtual void Init();
 	virtual ~ScreenTestLights();
 
-	virtual void DrawPrimitives();
 	virtual void Update( float fDelta );
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
 	virtual void HandleScreenMessage( const ScreenMessage SM );
diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index 290ceae67c..381a1c58c3 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -203,16 +203,6 @@ void ScreenTextEntry::PositionCursor()
 	m_sprCursor->SetXY( bt.GetX(), bt.GetY() );
 }
 
-void ScreenTextEntry::Update( float fDeltaTime )
-{
-	Screen::Update( fDeltaTime );
-}
-
-void ScreenTextEntry::DrawPrimitives()
-{
-	Screen::DrawPrimitives();
-}
-
 void ScreenTextEntry::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
 {
 	if( m_In.IsTransitioning() || m_Out.IsTransitioning() || m_Cancel.IsTransitioning() )
diff --git a/stepmania/src/ScreenTextEntry.h b/stepmania/src/ScreenTextEntry.h
index 94ba480ee8..2b27ab29d1 100644
--- a/stepmania/src/ScreenTextEntry.h
+++ b/stepmania/src/ScreenTextEntry.h
@@ -58,8 +58,6 @@ public:
 	~ScreenTextEntry();
 	virtual void Init();
 
-	virtual void Update( float fDeltaTime );
-	virtual void DrawPrimitives();
 	virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
 	virtual void HandleScreenMessage( const ScreenMessage SM );