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

make Start exit ScreenEnding

Browse Source
This commit is contained in:
Chris Danford
2004-05-14 07:14:45 +00:00
parent 762768e534
commit 83c0c4dda5
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEnding.cpp
+24 -8
View File
@@ -26,6 +26,7 @@
#include "StyleDef.h" #include "StyleDef.h"
#include "GameManager.h" #include "GameManager.h"
#include "SongUtil.h" #include "SongUtil.h"
#include "ScreenManager.h"
#define SCROLL_DELAY THEME->GetMetricF("ScreenEnding","ScrollDelay") #define SCROLL_DELAY THEME->GetMetricF("ScreenEnding","ScrollDelay")
@@ -137,20 +138,35 @@ void ScreenEnding::Update( float fDeltaTime )
{ {
ScreenAttract::Update( fDeltaTime ); ScreenAttract::Update( fDeltaTime );
if( !m_In.IsTransitioning() && !m_Out.IsTransitioning() ) if( m_In.IsTransitioning() && m_Out.IsTransitioning() )
return;
FOREACH_PlayerNumber( p )
{ {
FOREACH_PlayerNumber( p ) if( m_bWaitingForRemoveCard[p] )
{ {
if( m_bWaitingForRemoveCard[p] ) m_bWaitingForRemoveCard[p] = MEMCARDMAN->GetCardState((PlayerNumber)p)!=MEMORY_CARD_STATE_NO_CARD;
{ if( !m_bWaitingForRemoveCard[p] )
m_bWaitingForRemoveCard[p] = MEMCARDMAN->GetCardState((PlayerNumber)p)!=MEMORY_CARD_STATE_NO_CARD; m_sprRemoveMemoryCard[p].SetHidden( true );
if( !m_bWaitingForRemoveCard[p] )
m_sprRemoveMemoryCard[p].SetHidden( true );
}
} }
} }
} }
void ScreenEnding::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{
if( MenuI.IsValid() )
{
switch( MenuI.button )
{
case MENU_BUTTON_START:
SCREENMAN->PostMessageToTopScreen( SM_BeginFadingOut, 0 );
break;
}
}
ScreenAttract::Input( DeviceI, type, GameI, MenuI, StyleI );
}
void ScreenEnding::HandleScreenMessage( const ScreenMessage SM ) void ScreenEnding::HandleScreenMessage( const ScreenMessage SM )
{ {
ScreenAttract::HandleScreenMessage( SM ); ScreenAttract::HandleScreenMessage( SM );
stepmania/src/ScreenEnding.h
+1
View File
@@ -29,6 +29,7 @@ public:
~ScreenEnding(); ~ScreenEnding();
void Update( float fDeltaTime ); void Update( float fDeltaTime );
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
void HandleScreenMessage( const ScreenMessage SM ); void HandleScreenMessage( const ScreenMessage SM );
private: private: