From 8274c123b771bfd39a8338dd3cdddce7b9fd7dbc Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 6 Feb 2005 08:50:08 +0000 Subject: [PATCH] don't wait for removal if in MEMORY_CARD_STATE_REMOVED --- stepmania/src/ScreenEnding.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp index 52ef521e38..850ac3b3a3 100644 --- a/stepmania/src/ScreenEnding.cpp +++ b/stepmania/src/ScreenEnding.cpp @@ -214,7 +214,14 @@ ScreenEnding::ScreenEnding( CString sClassName ) : ScreenAttract( sClassName, fa SET_XY_AND_ON_COMMAND( m_textPlayerName[p] ); this->AddChild( &m_textPlayerName[p] ); - m_bWaitingForRemoveCard[p] = MEMCARDMAN->GetCardState(p)!=MEMORY_CARD_STATE_NO_CARD; + m_bWaitingForRemoveCard[p] = true; + switch( MEMCARDMAN->GetCardState(p) ) + { + case MEMORY_CARD_STATE_REMOVED: + case MEMORY_CARD_STATE_NO_CARD: + m_bWaitingForRemoveCard[p] = false; + break; + } if( pProfile == NULL ) continue; // don't show the stats lines @@ -265,7 +272,14 @@ void ScreenEnding::Update( float fDeltaTime ) { if( m_bWaitingForRemoveCard[p] ) { - m_bWaitingForRemoveCard[p] = MEMCARDMAN->GetCardState(p)!=MEMORY_CARD_STATE_NO_CARD; + m_bWaitingForRemoveCard[p] = true; + switch( MEMCARDMAN->GetCardState(p) ) + { + case MEMORY_CARD_STATE_REMOVED: + case MEMORY_CARD_STATE_NO_CARD: + m_bWaitingForRemoveCard[p] = false; + break; + } if( !m_bWaitingForRemoveCard[p] ) m_sprRemoveMemoryCard[p].SetHidden( true ); }