From b3e3ab1187538ca0e8bb27fce938d9f403494ecd Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 28 May 2008 01:28:35 +0000
Subject: [PATCH] allow using ScreenContinue without mandatory timer wait

---
 stepmania/src/ScreenContinue.cpp | 4 +++-
 stepmania/src/ScreenContinue.h   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/stepmania/src/ScreenContinue.cpp b/stepmania/src/ScreenContinue.cpp
index df238dfc13..c9da2e45fa 100644
--- a/stepmania/src/ScreenContinue.cpp
+++ b/stepmania/src/ScreenContinue.cpp
@@ -16,6 +16,8 @@ void ScreenContinue::Init()
 	ScreenWithMenuElementsSimple::Init();
 
 	this->SubscribeToMessage( Message_PlayerJoined );
+
+	FORCE_TIMER_WAIT.Load( m_sName, "ForceTimerWait" );
 }
 
 void ScreenContinue::BeginScreen()
@@ -57,7 +59,7 @@ void ScreenContinue::Input( const InputEventPlus &input )
 	if( IsTransitioning() )
 		return;
 
-	if( input.type == IET_FIRST_PRESS  &&  GAMESTATE->IsHumanPlayer(input.pn) )
+	if( input.type == IET_FIRST_PRESS  &&  GAMESTATE->IsHumanPlayer(input.pn)  &&  FORCE_TIMER_WAIT )
 	{
 		switch( input.MenuI )
 		{
diff --git a/stepmania/src/ScreenContinue.h b/stepmania/src/ScreenContinue.h
index e824fe3cbb..762590ef30 100644
--- a/stepmania/src/ScreenContinue.h
+++ b/stepmania/src/ScreenContinue.h
@@ -15,7 +15,9 @@ public:
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 	virtual void HandleMessage( const Message &msg );
 	virtual bool AllowLateJoin() const { return true; }
+
 private:
+	ThemeMetric<bool> FORCE_TIMER_WAIT;
 };
 
 #endif