From bcce4df6f78be688ecdca1402abd4b09cb4b9781 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 1 Mar 2005 16:03:11 +0000
Subject: [PATCH] split ExtraSleepAfterTweenOffSeconds into
 OverrideSleepAfterTweenOffSeconds and SleepAfterTweenOffSeconds for added
 control

---
 stepmania/Themes/default/metrics.ini |  7 ++++---
 stepmania/src/ScreenSelectMaster.cpp | 12 +++++++++---
 stepmania/src/ScreenSelectMaster.h   |  3 ++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 8d6b7d585d..c2a66d2b56 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2895,7 +2895,8 @@ ScrollerSpacingX=0
 ScrollerSpacingY=0
 StyleIcon=1
 MemoryCardIcons=1
-ExtraSleepAfterTweenOffSeconds=0
+OverrideSleepAfterTweenOffSeconds=0
+SleepAfterTweenOffSeconds=0
 NumCodes=0
 OptionOrderUp=
 OptionOrderDown=
@@ -3176,7 +3177,8 @@ ScrollerSpacingX=0
 ScrollerSpacingY=0
 StyleIcon=1
 MemoryCardIcons=1
-ExtraSleepAfterTweenOffSeconds=0
+OverrideSleepAfterTweenOffSeconds=0
+SleepAfterTweenOffSeconds=0
 NumCodes=0
 OptionOrderUp=
 OptionOrderDown=
@@ -3210,7 +3212,6 @@ MorePage2X=
 MorePage2Y=
 MorePage2OnCommand=hidden,1
 MorePage2OffCommand=
-ExtraSleepAfterTweenOffSeconds=0
 IdleCommentSeconds=15
 IdleTimeoutSeconds=0
 
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 7b7a8ce9a8..130d5001af 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -33,7 +33,8 @@ ScreenSelectMaster::ScreenSelectMaster( CString sClassName ) : ScreenSelect( sCl
 	CURSOR_OFFSET_Y_FROM_ICON(m_sName,CURSOR_OFFSET_Y_FROM_ICON_NAME,NUM_PLAYERS,NUM_CURSOR_PARTS),
 	PRE_SWITCH_PAGE_SECONDS(m_sName,"PreSwitchPageSeconds"),
 	POST_SWITCH_PAGE_SECONDS(m_sName,"PostSwitchPageSeconds"),
-	EXTRA_SLEEP_AFTER_TWEEN_OFF_SECONDS(m_sName,"ExtraSleepAfterTweenOffSeconds"),
+	OVERRIDE_SLEEP_AFTER_TWEEN_OFF_SECONDS(m_sName,"OverrideSleepAfterTweenOffSeconds"),
+	SLEEP_AFTER_TWEEN_OFF_SECONDS(m_sName,"SleepAfterTweenOffSeconds"),
 	OPTION_ORDER(m_sName,OPTION_ORDER_NAME,NUM_MENU_DIRS),
 	WRAP_CURSOR(m_sName,"WrapCursor"),
 	SHOW_SCROLLER(m_sName,"ShowScroller"),
@@ -311,11 +312,16 @@ void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM )
 	case SM_BeginFadingOut:
 		{
 			TweenOffScreen();
-			float fSecs = GetTweenTimeLeft();
+
+			float fSecs = 0;
 			/* This can be used to allow overlap between the main tween-off and the MenuElements
 			 * tweenoff. */
-			fSecs += EXTRA_SLEEP_AFTER_TWEEN_OFF_SECONDS;
+			if( OVERRIDE_SLEEP_AFTER_TWEEN_OFF_SECONDS )
+				fSecs = SLEEP_AFTER_TWEEN_OFF_SECONDS;
+			else
+				fSecs = GetTweenTimeLeft();
 			fSecs = max( fSecs, 0 );
+
 			SCREENMAN->PostMessageToTopScreen( SM_AllDoneChoosing, fSecs );	// nofify parent that we're finished
 			StopTimer();
 		}
diff --git a/stepmania/src/ScreenSelectMaster.h b/stepmania/src/ScreenSelectMaster.h
index f0cb9e8cef..ca08c8d399 100644
--- a/stepmania/src/ScreenSelectMaster.h
+++ b/stepmania/src/ScreenSelectMaster.h
@@ -46,7 +46,8 @@ protected:
 	ThemeMetric2D<float>	CURSOR_OFFSET_Y_FROM_ICON;
 	ThemeMetric<float>		PRE_SWITCH_PAGE_SECONDS;
 	ThemeMetric<float>		POST_SWITCH_PAGE_SECONDS;
-	ThemeMetric<float>		EXTRA_SLEEP_AFTER_TWEEN_OFF_SECONDS;
+	ThemeMetric<bool>		OVERRIDE_SLEEP_AFTER_TWEEN_OFF_SECONDS;
+	ThemeMetric<float>		SLEEP_AFTER_TWEEN_OFF_SECONDS;
 	ThemeMetric1D<CString>	OPTION_ORDER;
 	ThemeMetric<bool>		WRAP_CURSOR;
 	ThemeMetric<bool>		SHOW_SCROLLER;