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

style fix

Browse Source
This commit is contained in:
Vecais Dumais Laacis
2007-08-08 10:03:42 +00:00
parent 38f93f78cf
commit 9b4cf9a6df
2 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectProfile.cpp
+2 -19
View File
@@ -1,26 +1,9 @@
#include "global.h" #include "global.h"
#include "ScreenSelectProfile.h" #include "ScreenSelectProfile.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "SongManager.h"
#include "GameSoundManager.h"
#include "ThemeManager.h"
#include "AnnouncerManager.h"
#include "song.h"
#include "ProfileManager.h" #include "ProfileManager.h"
#include "Profile.h"
#include "ActorUtil.h"
#include "GameState.h" #include "GameState.h"
#include "MemoryCardManager.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 ); REGISTER_SCREEN_CLASS( ScreenSelectProfile );
@@ -83,7 +66,7 @@ bool ScreenSelectProfile::Finish(){
return false; return false;
// if profile indexes are the same for both players // 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; return false;
} }
@@ -95,7 +78,7 @@ bool ScreenSelectProfile::Finish(){
return false; return false;
// card not ready // 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; return false;
// profile index too big // profile index too big
stepmania/src/ScreenSelectProfile.h
-4
View File
@@ -3,17 +3,13 @@
#ifndef SCREEN_Select_PROFILE_H #ifndef SCREEN_Select_PROFILE_H
#define SCREEN_Select_PROFILE_H #define SCREEN_Select_PROFILE_H
#include "BitmapText.h"
#include "ScreenWithMenuElements.h" #include "ScreenWithMenuElements.h"
#include "Sprite.h"
#include "ActorScroller.h"
class ScreenSelectProfile : public ScreenWithMenuElements class ScreenSelectProfile : public ScreenWithMenuElements
{ {
public: public:
virtual void Init(); virtual void Init();
virtual void Input( const InputEventPlus &input ); virtual void Input( const InputEventPlus &input );
//virtual void MenuStart( const InputEventPlus &input );
// Lua // Lua
void PushSelf( lua_State *L ); void PushSelf( lua_State *L );