fix LockInputSecs not being set correctly, and pressing Start early would choose without starting SM_GoToNextScreen

This commit is contained in:
Chris Danford
2009-04-04 17:45:07 +00:00
parent 6afd28c002
commit 167a061b3e
2 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -183,7 +183,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
SCREENMAN->RefreshCreditsMessages(); SCREENMAN->RefreshCreditsMessages();
if( !IsTransitioning() ) ASSERT( !IsTransitioning() );
StartTransitioningScreen( SM_GoToNextScreen ); StartTransitioningScreen( SM_GoToNextScreen );
} }
+3 -2
View File
@@ -269,9 +269,10 @@ void ScreenSelectMaster::BeginScreen()
this->UpdateSelectableChoices(); this->UpdateSelectableChoices();
m_fLockInputSecs = this->GetTweenTimeLeft();
ScreenSelect::BeginScreen(); ScreenSelect::BeginScreen();
// Call GetTweenTimeLeft after the base BeginScreen has started the in Transition.
m_fLockInputSecs = this->GetTweenTimeLeft();
} }
void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM ) void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM )