From 42ee4096ae80e2d21b3dbbfd5c8fc58ecfe6b8f8 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 4 May 2004 02:00:15 +0000
Subject: [PATCH] add off commands

---
 stepmania/src/ScreenNameEntryTraditional.cpp | 16 ++++++++++++++--
 stepmania/src/ScreenNameEntryTraditional.h   |  7 +++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index 39aa902812..b0e3bf4b7b 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -595,7 +595,7 @@ void ScreenNameEntryTraditional::Finish( PlayerNumber pn )
 	OFF_COMMAND( m_sprCursor[pn] );
 
 	if( !AnyStillEntering() )
-		StartTransitioning( SM_GoToNextScreen );
+		AllFinished();
 }
 
 void ScreenNameEntryTraditional::UpdateSelectionText( int pn )
@@ -611,7 +611,7 @@ void ScreenNameEntryTraditional::MenuStart( PlayerNumber pn, const InputEventTyp
 {
 	if( !AnyStillEntering() )
 	{
-		StartTransitioning( SM_GoToNextScreen );
+		AllFinished();
 		return;
 	}
 
@@ -693,3 +693,15 @@ void ScreenNameEntryTraditional::MenuRight( PlayerNumber pn, const InputEventTyp
 	PositionCharsAndCursor( pn );
 	m_soundChange.Play();
 }
+
+void ScreenNameEntryTraditional::AllFinished()
+{
+	StartTransitioning( SM_GoToNextScreen );
+
+	FOREACH_HumanPlayer( pn )
+	{
+		OFF_COMMAND( m_sprOutOfRanking[pn] );
+		OFF_COMMAND( m_sprNameFrame[pn] );
+		OFF_COMMAND( m_textSelection[pn] );
+	}
+}
\ No newline at end of file
diff --git a/stepmania/src/ScreenNameEntryTraditional.h b/stepmania/src/ScreenNameEntryTraditional.h
index 955e1d6996..816836f899 100644
--- a/stepmania/src/ScreenNameEntryTraditional.h
+++ b/stepmania/src/ScreenNameEntryTraditional.h
@@ -59,6 +59,7 @@ public:
 
 private:
 	bool AnyStillEntering() const;
+	void AllFinished();
 	void PositionCharsAndCursor( int pn );
 	void Finish( PlayerNumber pn );
 	void UpdateSelectionText( int pn );
@@ -76,6 +77,8 @@ private:
 	vector<int>		m_AlphabetLetter[NUM_PLAYERS];
 	int				m_SelectedChar[NUM_PLAYERS];
 	AutoActor		m_sprOutOfRanking[NUM_PLAYERS];	// shown if didn't make any high scores
+	Sprite			m_sprNameFrame[NUM_PLAYERS];
+	BitmapText		m_textSelection[NUM_PLAYERS];
 
 	/* Feat display: */
 	struct FeatDisplay
@@ -91,14 +94,10 @@ private:
 
 	vector<FeatDisplay>		m_FeatDisplay[NUM_PLAYERS];
 	
-	Sprite			m_sprNameFrame[NUM_PLAYERS];
-
-
 	RageSound		m_soundChange;
 	RageSound		m_soundKey;
 	RageSound		m_soundInvalid;
 
-	BitmapText		m_textSelection[NUM_PLAYERS];
 	wstring			m_sSelection[NUM_PLAYERS];
 	bool			m_bStillEnteringName[NUM_PLAYERS];
 	bool			m_bGoToNextScreenWhenCardsRemoved;