This commit is contained in:
Steve Checkoway
2007-08-07 22:14:51 +00:00
parent 7a8be07a88
commit 60e94b15fb
2 changed files with 7 additions and 12 deletions
+2 -5
View File
@@ -144,10 +144,7 @@ void ScreenNameEntryTraditional::Input( const InputEventPlus &input )
{ {
if( IsTransitioning() ) if( IsTransitioning() )
return; return;
if( if( input.MenuI != GameButton_Invalid && input.pn != PlayerNumber_Invalid )
( input.MenuI != GameButton_Invalid ) &&
( input.pn != PlayerNumber_Invalid )
)
{ {
switch( input.type ) switch( input.type )
{ {
@@ -158,10 +155,10 @@ void ScreenNameEntryTraditional::Input( const InputEventPlus &input )
msg.SetParam( "PlayerNumber", input.pn ); msg.SetParam( "PlayerNumber", input.pn );
msg.SetParam( "MenuItem", GameButtonToString( INPUTMAPPER->GetInputScheme(), input.MenuI ) ); msg.SetParam( "MenuItem", GameButtonToString( INPUTMAPPER->GetInputScheme(), input.MenuI ) );
this->HandleMessage( msg ); this->HandleMessage( msg );
}
break; break;
} }
} }
}
ScreenWithMenuElements::Input( input ); ScreenWithMenuElements::Input( input );
} }
-2
View File
@@ -87,9 +87,7 @@ void ScreenSelectMusic::Init()
//clear cached trails if any - cached trails points to already freed data if returning to select course after course played //clear cached trails if any - cached trails points to already freed data if returning to select course after course played
SONGMAN->InvalidateCachedTrails(); SONGMAN->InvalidateCachedTrails();
FOREACH_ENUM( PlayerNumber, p ) FOREACH_ENUM( PlayerNumber, p )
{
GAMESTATE->m_pCurTrail[p].Set( NULL ); GAMESTATE->m_pCurTrail[p].Set( NULL );
}
/* Cache: */ /* Cache: */
m_sSectionMusicPath = THEME->GetPathS(m_sName,"section music"); m_sSectionMusicPath = THEME->GetPathS(m_sName,"section music");