either start or select can trigger "give up"

stepmania/src/ScreenGameplay.cpp

@@ -90,6 +90,9 @@ REGISTER_SCREEN_CLASS( ScreenGameplay );
 ScreenGameplay::ScreenGameplay( CString sName ) : Screen(sName)
 {
 	PLAYER_TYPE.Load( sName, "PlayerType" );
+	START_GIVES_UP.Load( sName, "StartGivesUp" );
+	BACK_GIVES_UP.Load( sName, "BackGivesUp" );
+	GIVING_UP_FAILS.Load( sName, "GivingUpFails" );
 }
 
 void ScreenGameplay::Init()
@@ -1505,6 +1508,9 @@ void ScreenGameplay::Update( float fDeltaTime )
 	if( !m_GiveUpTimer.IsZero() && m_GiveUpTimer.Ago() > 4.0f )
 	{
 		m_GiveUpTimer.SetZero();
+
+		if( GIVING_UP_FAILS )
+		{
 			/* Unless we're in FailOff, giving up means failing the song. */
 			switch( GAMESTATE->m_SongOptions.m_FailType )
 			{
@@ -1516,6 +1522,10 @@ void ScreenGameplay::Update( float fDeltaTime )
 			}
 
 			this->PostScreenMessage( SM_NotesEnded, 0 );
+		} else {
+			BackOutFromGameplay();
+			return;
+		}
 	}
 
 	//
@@ -1664,6 +1674,18 @@ void ScreenGameplay::UpdateLights()
 	}
 }
 
+void ScreenGameplay::BackOutFromGameplay()
+{
+	m_DancingState = STATE_OUTRO;
+	SCREENMAN->PlayBackSound();
+	
+	m_pSoundMusic->StopPlaying();
+	m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */
+
+	this->ClearMessageQueue();
+	m_Back.StartTransitioning( SM_SaveChangedBeforeGoingBack );
+}
+
 void ScreenGameplay::AbortGiveUp()
 {
 	if( m_GiveUpTimer.IsZero() )
@@ -1699,7 +1721,11 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
 		 * treated as failing the song, unlike BACK, since it's always available.
 		 *
 		 * However, if this is also a style button, don't do this. (pump center = start) */
-		if( MenuI.button == MENU_BUTTON_START && !StyleI.IsValid() )
+		bool bHoldingGiveUp = false;
+		bHoldingGiveUp |= (MenuI.button == MENU_BUTTON_START && !StyleI.IsValid() && START_GIVES_UP);
+		bHoldingGiveUp |= (MenuI.button == MENU_BUTTON_BACK && !StyleI.IsValid() && BACK_GIVES_UP);
+		
+		if( bHoldingGiveUp )
 		{
 			/* No PREFSMAN->m_bDelayedEscape; always delayed. */
 			if( type==IET_RELEASE )
@@ -1717,51 +1743,32 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
 			return;
 		}
 
-		if( MenuI.button == MENU_BUTTON_BACK && 
+		/* Only handle MENU_BUTTON_BACK as a regular BACK button if BACK_GIVES_UP is
-			((!PREFSMAN->m_bDelayedBack && type==IET_FIRST_PRESS) ||
+		 * disabled. */
+		if( MenuI.button == MENU_BUTTON_BACK && !BACK_GIVES_UP )
+		{
+			if( ((!PREFSMAN->m_bDelayedBack && type==IET_FIRST_PRESS) ||
 				(DeviceI.device==DEVICE_KEYBOARD && (type==IET_SLOW_REPEAT||type==IET_FAST_REPEAT)) ||
 				(DeviceI.device!=DEVICE_KEYBOARD && type==IET_FAST_REPEAT)) )
 			{
-			/* I had battle mode back out on me mysteriously once. -glenn */
 				LOG->Trace("Player %i went back", MenuI.player+1);
-
+				BackOutFromGameplay();
-			m_DancingState = STATE_OUTRO;
-			SCREENMAN->PlayBackSound();
-			/* Hmm.  There are a bunch of subtly different ways we can
-			 * tween out: 
-			 *   1. Keep rendering the song, and keep it moving.  This might
-			 *      cause problems if the cancel and the end of the song overlap.
-			 *   2. Stop the song completely, so all song motion under the tween
-			 *      ceases.
-			 *   3. Stop the song, but keep effects (eg. Drunk) running.
-			 *   4. Don't display the song at all.
-			 *
-			 * We're doing #3.  I'm not sure which is best.
-			 */
-			
-			m_pSoundMusic->StopPlaying();
-			m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */
-
-			this->ClearMessageQueue();
-			m_Back.StartTransitioning( SM_SaveChangedBeforeGoingBack );
-			return;
 			}
-
+			else if( PREFSMAN->m_bDelayedBack && type==IET_FIRST_PRESS )
-		if( MenuI.button == MENU_BUTTON_BACK && PREFSMAN->m_bDelayedBack && type==IET_FIRST_PRESS)
 			{
 				m_textDebug.SetText( "Continue holding BACK to quit" );
 				m_textDebug.StopTweening();
 				m_textDebug.SetDiffuse( RageColor(1,1,1,0) );
 				m_textDebug.BeginTweening( 1/8.f );
 				m_textDebug.SetDiffuse( RageColor(1,1,1,1) );
-			return;
 			}
-		
+			else if( PREFSMAN->m_bDelayedBack && type==IET_RELEASE )
-		if( MenuI.button == MENU_BUTTON_BACK && PREFSMAN->m_bDelayedBack && type==IET_RELEASE )
 			{
 				m_textDebug.StopTweening();
 				m_textDebug.BeginTweening( 1/8.f );
 				m_textDebug.SetDiffuse( RageColor(1,1,1,0) );
+			}
+
 			return;
 		}
 	}

stepmania/src/ScreenGameplay.h

@@ -25,6 +25,7 @@ class Inventory;
 #include "ActiveAttackList.h"
 #include "NetworkSyncManager.h"
 #include "AutoKeysounds.h"
+#include "ThemeMetric.h"
 
 class LyricsLoader;
 class ScreenGameplay : public Screen
@@ -42,6 +43,10 @@ public:
 	virtual bool UsesBackground() const { return false; }
 
 protected:
+	ThemeMetric<bool> START_GIVES_UP;
+	ThemeMetric<bool> BACK_GIVES_UP;
+	ThemeMetric<bool> GIVING_UP_FAILS;
+
 	void TweenOnScreen();
 	void TweenOffScreen();
 
@@ -53,6 +58,7 @@ protected:
 	void ShowSavePrompt( ScreenMessage SM_SendWhenDone );
 	void PlayAnnouncer( CString type, float fSeconds );
 	void UpdateLights();
+	void BackOutFromGameplay();
 
 	void PlayTicks();
 	void UpdateSongPosition( float fDeltaTime );