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

fix ending never fades out if no memory cards removed

Browse Source
This commit is contained in:
Chris Danford
2004-01-11 09:26:01 +00:00
parent 02d371c494
commit cf06498ff3
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEnding.cpp
+6 -5
View File
@@ -133,7 +133,10 @@ void ScreenEnding::Update( float fDeltaTime )
{ {
ScreenAttract::Update( fDeltaTime ); ScreenAttract::Update( fDeltaTime );
bool bRemovedOneOrMore = false; m_fTimeUntilBeginFadingOut = max( 0, m_fTimeUntilBeginFadingOut-fDeltaTime );
if( !m_In.IsTransitioning() && !m_Out.IsTransitioning() )
{
bool bAllRemoved = true; bool bAllRemoved = true;
for( int p=0; p<NUM_PLAYERS; p++ ) for( int p=0; p<NUM_PLAYERS; p++ )
@@ -148,15 +151,13 @@ void ScreenEnding::Update( float fDeltaTime )
else else
{ {
m_sprRemoveMemoryCard[p].SetHidden( true ); m_sprRemoveMemoryCard[p].SetHidden( true );
bRemovedOneOrMore = true;
} }
} }
} }
m_fTimeUntilBeginFadingOut = max( 0, m_fTimeUntilBeginFadingOut-fDeltaTime ); if( bAllRemoved )
if( bRemovedOneOrMore && bAllRemoved )
this->PostScreenMessage( SM_BeginFadingOut, m_fTimeUntilBeginFadingOut ); this->PostScreenMessage( SM_BeginFadingOut, m_fTimeUntilBeginFadingOut );
}
} }
void ScreenEnding::HandleScreenMessage( const ScreenMessage SM ) void ScreenEnding::HandleScreenMessage( const ScreenMessage SM )