actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 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
+23 -22
View File
@@ -133,30 +133,31 @@ void ScreenEnding::Update( float fDeltaTime )
{
ScreenAttract::Update( fDeltaTime );
bool bRemovedOneOrMore = false;
bool bAllRemoved = true;
for( int p=0; p<NUM_PLAYERS; p++ )
{
if( m_bWaitingForRemoveCard[p] )
{
m_bWaitingForRemoveCard[p] = MEMCARDMAN->GetCardState((PlayerNumber)p)!=MEMORY_CARD_STATE_NO_CARD;
if( m_bWaitingForRemoveCard[p] )
{
bAllRemoved = false;
}
else
{
m_sprRemoveMemoryCard[p].SetHidden( true );
bRemovedOneOrMore = true;
}
}
}
m_fTimeUntilBeginFadingOut = max( 0, m_fTimeUntilBeginFadingOut-fDeltaTime );
if( bRemovedOneOrMore && bAllRemoved )
this->PostScreenMessage( SM_BeginFadingOut, m_fTimeUntilBeginFadingOut );
if( !m_In.IsTransitioning() && !m_Out.IsTransitioning() )
{
bool bAllRemoved = true;
for( int p=0; p<NUM_PLAYERS; p++ )
{
if( m_bWaitingForRemoveCard[p] )
{
m_bWaitingForRemoveCard[p] = MEMCARDMAN->GetCardState((PlayerNumber)p)!=MEMORY_CARD_STATE_NO_CARD;
if( m_bWaitingForRemoveCard[p] )
{
bAllRemoved = false;
}
else
{
m_sprRemoveMemoryCard[p].SetHidden( true );
}
}
}
if( bAllRemoved )
this->PostScreenMessage( SM_BeginFadingOut, m_fTimeUntilBeginFadingOut );
}
}
void ScreenEnding::HandleScreenMessage( const ScreenMessage SM )