actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix duplicate ScreenGameplay overlays, broken DancingState transitions

Browse Source
This commit is contained in:
Chris Danford
2005-04-02 02:45:17 +00:00
parent 825d3b30e6
commit 5f2f3ab9c8
5 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenWithMenuElements.cpp
+20 -14
View File
@@ -116,7 +116,7 @@ void ScreenWithMenuElements::Init()
m_Cancel.SetDrawOrder( DRAW_ORDER_TRANSITIONS );
this->AddChild( &m_Cancel );
m_In.StartTransitioning();
m_In.StartTransitioning( SM_DoneFadingIn );
}
ScreenWithMenuElements::~ScreenWithMenuElements()
@@ -164,6 +164,25 @@ void ScreenWithMenuElements::ResetTimer()
}
void ScreenWithMenuElements::StartTransitioning( ScreenMessage smSendWhenDone )
{
TweenOffScreen();
m_Out.StartTransitioning(smSendWhenDone);
/* Ack. If the transition finishes transparent (eg. _options to options),
* then we don't want to send the message until all of the *actors* are
* done tweening. However, if it finishes with something onscreen (most
* of the rest), we have to send the message immediately after it finishes,
* or we'll draw a frame without the transition.
*
* For now, I'll make the SMMAX2 option tweening faster. */
/* This includes all of the actors: */
// float TimeUntilFinished = GetTweenTimeLeft();
// TimeUntilFinished = max(TimeUntilFinished, m_Out.GetLengthSeconds());
// SCREENMAN->PostMessageToTopScreen( smSendWhenDone, TimeUntilFinished );
}
void ScreenWithMenuElements::TweenOffScreen()
{
if( m_bTimerEnabled )
{
@@ -183,19 +202,6 @@ void ScreenWithMenuElements::StartTransitioning( ScreenMessage smSendWhenDone )
SCREENMAN->PlaySharedBackgroundOffCommand();
m_Out.StartTransitioning(smSendWhenDone);
/* Ack. If the transition finishes transparent (eg. _options to options),
* then we don't want to send the message until all of the *actors* are
* done tweening. However, if it finishes with something onscreen (most
* of the rest), we have to send the message immediately after it finishes,
* or we'll draw a frame without the transition.
*
* For now, I'll make the SMMAX2 option tweening faster. */
/* This includes all of the actors: */
// float TimeUntilFinished = GetTweenTimeLeft();
// TimeUntilFinished = max(TimeUntilFinished, m_Out.GetLengthSeconds());
// SCREENMAN->PostMessageToTopScreen( smSendWhenDone, TimeUntilFinished );
}
void ScreenWithMenuElements::Cancel( ScreenMessage smSendWhenDone )