From c0de3d0397f984993a6d37e0ca7fdbde19c23fd9 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 13 Jan 2006 06:35:46 +0000
Subject: [PATCH] remove unused stuff

---
 stepmania/src/GameState.cpp | 26 +++-----------------------
 stepmania/src/GameState.h   |  4 ----
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index f431c0bf69..1cf57192d2 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -618,7 +618,8 @@ void GameState::ResetStageStatistics()
 	}
 
 	RemoveAllActiveAttacks();
-	RemoveAllInventory();
+	FOREACH_PlayerNumber( p )
+		m_pPlayerState[p]->RemoveAllInventory();
 	m_fOpponentHealthPercent = 1;
 	m_fTugLifePercentP1 = 0.5f;
 	FOREACH_PlayerNumber( p )
@@ -1135,31 +1136,10 @@ void GameState::GetUndisplayedBeats( const PlayerState* pPlayerState, float Tota
 }
 
 
-void GameState::LaunchAttack( MultiPlayer target, const Attack& a )
-{
-	m_pPlayerState[target]->LaunchAttack( a );
-}
-
-void GameState::RemoveActiveAttacksForPlayer( PlayerNumber pn, AttackLevel al )
-{
-	m_pPlayerState[pn]->RemoveActiveAttacks( al );
-}
-
-void GameState::EndActiveAttacksForPlayer( PlayerNumber pn )
-{
-	m_pPlayerState[pn]->EndActiveAttacks();
-}
-
-void GameState::RemoveAllInventory()
-{
-	FOREACH_PlayerNumber( p )
-		m_pPlayerState[p]->RemoveAllInventory();
-}
-
 void GameState::RemoveAllActiveAttacks()	// called on end of song
 {
 	FOREACH_PlayerNumber( p )
-		RemoveActiveAttacksForPlayer( p );
+		m_pPlayerState[p]->RemoveActiveAttacks();
 }
 
 template<class T>
diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h
index d30e9406b3..4c7bf8c6a7 100644
--- a/stepmania/src/GameState.h
+++ b/stepmania/src/GameState.h
@@ -190,11 +190,7 @@ public:
 	bool	m_bGoalComplete[NUM_PLAYERS];
 	
 	void GetUndisplayedBeats( const PlayerState* pPlayerState, float TotalSeconds, float &StartBeat, float &EndBeat ) const; // only meaningful when a NoteField is in use
-	void LaunchAttack( MultiPlayer target, const Attack& a );
 	void RemoveAllActiveAttacks();	// called on end of song
-	void RemoveActiveAttacksForPlayer( PlayerNumber pn, AttackLevel al=NUM_ATTACK_LEVELS /*all*/ );
-	void EndActiveAttacksForPlayer( PlayerNumber pn );
-	void RemoveAllInventory();
 	PlayerNumber GetBestPlayer() const;
 	StageResult GetStageResult( PlayerNumber pn ) const;