fix TweenOffScreen animation for GrooveRadar, MusicWheel

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 );
 }

stepmania/src/MusicWheel.cpp

@@ -596,14 +596,14 @@ void MusicWheel::DrawPrimitives()
 	{
 		MusicWheelItem& display = m_MusicWheelItems[i];
 
-//		switch( m_WheelState )
+		switch( m_WheelState )
-//		{
+		{
-//		case STATE_SELECTING_MUSIC:
+		case STATE_SELECTING_MUSIC:
-//		case STATE_ROULETTE_SPINNING:
+		case STATE_ROULETTE_SPINNING:
-//		case STATE_ROULETTE_SLOWING_DOWN:
+		case STATE_ROULETTE_SLOWING_DOWN:
-//		case STATE_RANDOM_SPINNING:
+		case STATE_RANDOM_SPINNING:
-//		case STATE_LOCKED:
+		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;

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();
 }
 
 

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 );
 };
 

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" );

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();