Changes in preparation for handling IET_RELEASE.

This commit is contained in:
Glenn Maynard
2002-08-21 21:47:06 +00:00
parent 2f82d0be50
commit 7c905e971c
4 changed files with 8 additions and 2 deletions
+5 -1
View File
@@ -48,7 +48,11 @@ void Screen::Update( float fDeltaTime )
void Screen::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{
if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == DIK_ESCAPE ) // don't make user hold back button if they're pressing escape
/* Don't send release messages with the default handler. */
if(type == IET_RELEASE) return; // don't care
// don't make user hold back button if they're pressing escape
if( DeviceI.device == DEVICE_KEYBOARD && DeviceI.button == DIK_ESCAPE )
{
this->MenuBack( MenuI.player );
return;
+1 -1
View File
@@ -692,7 +692,6 @@ void ScreenGameplay::LoadNextSong( bool bFirstLoad )
m_Player[p].Load( (PlayerNumber)p, &newNoteData, m_pLifeMeter[p], m_pScoreDisplay[p] );
}
m_Background.LoadFromSong( GAMESTATE->m_pCurSong );
m_Background.SetDiffuseColor( D3DXCOLOR(0.5f,0.5f,0.5f,1) );
m_Background.BeginTweeningQueued( 2 );
@@ -919,6 +918,7 @@ void ScreenGameplay::DrawPrimitives()
void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{
//LOG->Trace( "ScreenGameplay::Input()" );
if(type == IET_RELEASE) return; // don't care
if( GAMESTATE->m_bDemonstration )
{
+1
View File
@@ -143,6 +143,7 @@ void ScreenSelectCourse::TweenOffScreen()
void ScreenSelectCourse::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{
LOG->Trace( "ScreenSelectCourse::Input()" );
if(type == IET_RELEASE) return; // don't care
if( m_Menu.IsClosing() )
return; // ignore
+1
View File
@@ -434,6 +434,7 @@ const int MENU_NEXT_SORT_PATTERN_SIZE = sizeof(MENU_NEXT_SORT_PATTERN) / sizeof(
void ScreenSelectMusic::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{
LOG->Trace( "ScreenSelectMusic::Input()" );
if(type == IET_RELEASE) return; // don't care
if( MenuI.player == PLAYER_INVALID )
return;