From cf8f069abd20969a5e0143302955d3c41b763bcd Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Thu, 3 Apr 2003 22:34:22 +0000
Subject: [PATCH] fix TweenOffScreen animation for GrooveRadar, MusicWheel

---
 stepmania/src/GrooveRadar.cpp         |  2 +-
 stepmania/src/MusicWheel.cpp          | 22 +++++++++++-----------
 stepmania/src/ScreenManager.cpp       |  4 ++--
 stepmania/src/ScreenManager.h         |  3 ++-
 stepmania/src/ScreenNameEntry.cpp     |  2 +-
 stepmania/src/ScreenPlayerOptions.cpp |  2 +-
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/stepmania/src/GrooveRadar.cpp b/stepmania/src/GrooveRadar.cpp
index c6fb902b97..ee8c7710f7 100644
--- a/stepmania/src/GrooveRadar.cpp
+++ b/stepmania/src/GrooveRadar.cpp
@@ -213,6 +213,6 @@ void GrooveRadar::GrooveRadarValueMap::TweenOnScreen()
 void GrooveRadar::GrooveRadarValueMap::TweenOffScreen()
 {
 	BeginTweening( 0.6f );
-	SetTweenRotationZ( PI*4 );
+	SetTweenRotationZ( 180*4 );
 	SetTweenZoom( 0 );
 }
diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp
index 58216b4f1f..302dc58808 100644
--- a/stepmania/src/MusicWheel.cpp
+++ b/stepmania/src/MusicWheel.cpp
@@ -596,14 +596,14 @@ void MusicWheel::DrawPrimitives()
 	{
 		MusicWheelItem& display = m_MusicWheelItems[i];
 
-//		switch( m_WheelState )
-//		{
-//		case STATE_SELECTING_MUSIC:
-//		case STATE_ROULETTE_SPINNING:
-//		case STATE_ROULETTE_SLOWING_DOWN:
-//		case STATE_RANDOM_SPINNING:
-//		case STATE_LOCKED:
-//			{
+		switch( m_WheelState )
+		{
+		case STATE_SELECTING_MUSIC:
+		case STATE_ROULETTE_SPINNING:
+		case STATE_ROULETTE_SLOWING_DOWN:
+		case STATE_RANDOM_SPINNING:
+		case STATE_LOCKED:
+			{
 				float fThisBannerPositionOffsetFromSelection = i - NUM_WHEEL_ITEMS/2 + m_fPositionOffsetFromSelection;
 
 				float fX, fY, fZ, fRotationX;
@@ -615,9 +615,9 @@ void MusicWheel::DrawPrimitives()
 				display.SetXY( fX, fY );
 				display.SetZ( fZ );
 				display.SetRotationX( fRotationX );
-//			}
-//			break;
-//		}
+			}
+			break;
+		}
 
 		if( m_WheelState == STATE_LOCKED  &&  i != NUM_WHEEL_ITEMS/2 )
 			display.m_fPercentGray = 0.5f;
diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp
index 9594330ab6..f7699d423a 100644
--- a/stepmania/src/ScreenManager.cpp
+++ b/stepmania/src/ScreenManager.cpp
@@ -307,8 +307,6 @@ static bool g_TopNeedsNeedsNullUpdate = false;
 
 void ScreenManager::Update( float fDeltaTime )
 {
-	EmptyDeleteQueue();
-
 	// Only update the topmost screen on the stack.
 
 	/* Screens take some time to load.  If we don't do this, then screens
@@ -332,6 +330,8 @@ void ScreenManager::Update( float fDeltaTime )
 		pScreen->Update( fDeltaTime );
 
 	m_SystemLayer->Update( fDeltaTime );
+
+	EmptyDeleteQueue();
 }
 
 
diff --git a/stepmania/src/ScreenManager.h b/stepmania/src/ScreenManager.h
index 43fb641222..24b1f6d19f 100644
--- a/stepmania/src/ScreenManager.h
+++ b/stepmania/src/ScreenManager.h
@@ -51,6 +51,8 @@ public:
 
 	void RefreshCreditsMessages();
 
+	void EmptyDeleteQueue();
+
 private:
 	vector<Screen*> m_ScreenStack;	// bottommost to topmost
 	vector<Screen*> m_ScreensToDelete;
@@ -58,7 +60,6 @@ private:
 	ScreenSystemLayer *m_SystemLayer;
 
 	Screen* MakeNewScreen( CString sClassName );
-	void EmptyDeleteQueue();
 	void SetNewScreen( Screen *pNewScreen );
 };
 
diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index 890e24102b..8dc060a102 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -364,7 +364,7 @@ void ScreenNameEntry::HandleScreenMessage( const ScreenMessage SM )
 			for( int p=0; p<NUM_PLAYERS; p++ )
 				if( GAMESTATE->IsPlayerEnabled(p) )
 					max_grade = max( max_grade, stats.GetGrade((PlayerNumber)p) );
-			if( max_grade >= GRADE_AA )
+			if( GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2() )
 				SCREENMAN->SetNewScreen( "ScreenCredits" );
 			else
 				SCREENMAN->SetNewScreen( "ScreenMusicScroll" );
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index 58174858dd..706dae6a4d 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -123,7 +123,7 @@ void ScreenPlayerOptions::ImportOptions()
 
 		m_iSelectedOption[p][PO_HOLD_NOTES]	= po.m_bHoldNotes ? 1 : 0;
 		m_iSelectedOption[p][PO_DARK]		= po.m_fDark==1 ? 1 : 0;
-		m_iSelectedOption[p][PO_PERSPECTIVE]= SCALE( (int)po.m_fPerspectiveTilt, -1, +1, 0, 2 );
+		m_iSelectedOption[p][PO_PERSPECTIVE]= (int)po.m_fPerspectiveTilt + 1;
 
 
 		po.Init();