From 60e94b15fbb38f4fc826b03754df29c4007a6c36 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Tue, 7 Aug 2007 22:14:51 +0000 Subject: [PATCH] Style. --- stepmania/src/ScreenNameEntryTraditional.cpp | 17 +++++++---------- stepmania/src/ScreenSelectMusic.cpp | 2 -- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index 485a6436a8..f39f91d56a 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -144,23 +144,20 @@ void ScreenNameEntryTraditional::Input( const InputEventPlus &input ) { if( IsTransitioning() ) return; - if( - ( input.MenuI != GameButton_Invalid ) && - ( input.pn != PlayerNumber_Invalid ) - ) + if( input.MenuI != GameButton_Invalid && input.pn != PlayerNumber_Invalid ) { switch( input.type ) { case IET_FIRST_PRESS: case IET_REPEAT: - { - Message msg( "Input" ); - msg.SetParam( "PlayerNumber", input.pn ); - msg.SetParam( "MenuItem", GameButtonToString( INPUTMAPPER->GetInputScheme(), input.MenuI ) ); - this->HandleMessage( msg ); - } + { + Message msg( "Input" ); + msg.SetParam( "PlayerNumber", input.pn ); + msg.SetParam( "MenuItem", GameButtonToString( INPUTMAPPER->GetInputScheme(), input.MenuI ) ); + this->HandleMessage( msg ); break; } + } } ScreenWithMenuElements::Input( input ); } diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 4190bb4e78..825c727c78 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -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 SONGMAN->InvalidateCachedTrails(); FOREACH_ENUM( PlayerNumber, p ) - { GAMESTATE->m_pCurTrail[p].Set( NULL ); - } /* Cache: */ m_sSectionMusicPath = THEME->GetPathS(m_sName,"section music");