diff --git a/stepmania/src/ScreenSelectProfile.cpp b/stepmania/src/ScreenSelectProfile.cpp index 2826b37df4..717e299726 100644 --- a/stepmania/src/ScreenSelectProfile.cpp +++ b/stepmania/src/ScreenSelectProfile.cpp @@ -1,26 +1,9 @@ #include "global.h" #include "ScreenSelectProfile.h" #include "ScreenManager.h" -#include "SongManager.h" -#include "GameSoundManager.h" -#include "ThemeManager.h" -#include "AnnouncerManager.h" -#include "song.h" #include "ProfileManager.h" -#include "Profile.h" -#include "ActorUtil.h" #include "GameState.h" #include "MemoryCardManager.h" -#include "RageLog.h" -#include "Style.h" -#include "GameManager.h" -#include "PrefsManager.h" -#include "StatsManager.h" -#include "PlayerState.h" -#include "CommonMetrics.h" -#include "InputEventPlus.h" -#include "ScreenDimensions.h" -#include "InputMapper.h" REGISTER_SCREEN_CLASS( ScreenSelectProfile ); @@ -83,7 +66,7 @@ bool ScreenSelectProfile::Finish(){ return false; // if profile indexes are the same for both players - if( ( GAMESTATE->GetNumPlayersEnabled() == 2 ) && ( m_iSelectedProfiles[0] == m_iSelectedProfiles[1] ) && ( m_iSelectedProfiles[0] > 0 ) ) + if( GAMESTATE->GetNumPlayersEnabled() == 2 && m_iSelectedProfiles[0] == m_iSelectedProfiles[1] && m_iSelectedProfiles[0] > 0 ) { return false; } @@ -95,7 +78,7 @@ bool ScreenSelectProfile::Finish(){ return false; // card not ready - if( ( m_iSelectedProfiles[p] == 0 ) && (MEMCARDMAN->GetCardState( p ) != MemoryCardState_Ready ) ) + if( m_iSelectedProfiles[p] == 0 && MEMCARDMAN->GetCardState( p ) != MemoryCardState_Ready ) return false; // profile index too big diff --git a/stepmania/src/ScreenSelectProfile.h b/stepmania/src/ScreenSelectProfile.h index 89fe319210..67096c4bc1 100644 --- a/stepmania/src/ScreenSelectProfile.h +++ b/stepmania/src/ScreenSelectProfile.h @@ -3,17 +3,13 @@ #ifndef SCREEN_Select_PROFILE_H #define SCREEN_Select_PROFILE_H -#include "BitmapText.h" #include "ScreenWithMenuElements.h" -#include "Sprite.h" -#include "ActorScroller.h" class ScreenSelectProfile : public ScreenWithMenuElements { public: virtual void Init(); virtual void Input( const InputEventPlus &input ); - //virtual void MenuStart( const InputEventPlus &input ); // Lua void PushSelf( lua_State *L );