allow using ScreenContinue without mandatory timer wait
This commit is contained in:
@@ -16,6 +16,8 @@ void ScreenContinue::Init()
|
|||||||
ScreenWithMenuElementsSimple::Init();
|
ScreenWithMenuElementsSimple::Init();
|
||||||
|
|
||||||
this->SubscribeToMessage( Message_PlayerJoined );
|
this->SubscribeToMessage( Message_PlayerJoined );
|
||||||
|
|
||||||
|
FORCE_TIMER_WAIT.Load( m_sName, "ForceTimerWait" );
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenContinue::BeginScreen()
|
void ScreenContinue::BeginScreen()
|
||||||
@@ -57,7 +59,7 @@ void ScreenContinue::Input( const InputEventPlus &input )
|
|||||||
if( IsTransitioning() )
|
if( IsTransitioning() )
|
||||||
return;
|
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 )
|
switch( input.MenuI )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -15,7 +15,9 @@ public:
|
|||||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||||
virtual void HandleMessage( const Message &msg );
|
virtual void HandleMessage( const Message &msg );
|
||||||
virtual bool AllowLateJoin() const { return true; }
|
virtual bool AllowLateJoin() const { return true; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
ThemeMetric<bool> FORCE_TIMER_WAIT;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user