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

clean up duplicated code

Browse Source
This commit is contained in:
Chris Danford
2008-11-24 04:51:00 +00:00
parent b741bb4189
commit 8257edc12b
1 changed files with 14 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelectMaster.cpp
+14 -54
View File
@@ -31,6 +31,14 @@ static RString OPTION_ORDER_NAME( size_t dir ) { return "OptionOrder"+MenuDirToS
REGISTER_SCREEN_CLASS( ScreenSelectMaster ); REGISTER_SCREEN_CLASS( ScreenSelectMaster );
#define GetActiveElementPlayerNumbers( vpns ) \
if( SHARED_SELECTION ) { \
vpns.push_back( PLAYER_1 ); \
} else { \
FOREACH_HumanPlayer( p ) \
vpns.push_back( p ); \
}
ScreenSelectMaster::ScreenSelectMaster() ScreenSelectMaster::ScreenSelectMaster()
{ {
ZERO( m_iChoice ); ZERO( m_iChoice );
@@ -67,15 +75,7 @@ void ScreenSelectMaster::Init()
m_TrackingRepeatingInput = GameButton_Invalid; m_TrackingRepeatingInput = GameButton_Invalid;
vector<PlayerNumber> vpns; vector<PlayerNumber> vpns;
if( SHARED_SELECTION ) GetActiveElementPlayerNumbers( vpns );
{
vpns.push_back( PLAYER_1 );
}
else
{
FOREACH_ENUM( PlayerNumber, p )
vpns.push_back( p );
}
#define PLAYER_APPEND_NO_SPACE(p) (SHARED_SELECTION ? RString() : ssprintf("P%d",(p)+1)) #define PLAYER_APPEND_NO_SPACE(p) (SHARED_SELECTION ? RString() : ssprintf("P%d",(p)+1))
@@ -280,15 +280,7 @@ void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM )
vector<PlayerNumber> vpns; vector<PlayerNumber> vpns;
if( SHARED_SELECTION ) GetActiveElementPlayerNumbers( vpns );
{
vpns.push_back( PLAYER_1 );
}
else
{
FOREACH_HumanPlayer( p )
vpns.push_back( p );
}
if( SM == SM_PlayPostSwitchPage ) if( SM == SM_PlayPostSwitchPage )
@@ -326,15 +318,7 @@ int ScreenSelectMaster::GetSelectionIndex( PlayerNumber pn )
void ScreenSelectMaster::UpdateSelectableChoices() void ScreenSelectMaster::UpdateSelectableChoices()
{ {
vector<PlayerNumber> vpns; vector<PlayerNumber> vpns;
if( SHARED_SELECTION ) GetActiveElementPlayerNumbers( vpns );
{
vpns.push_back( PLAYER_1 );
}
else
{
FOREACH_HumanPlayer( p )
vpns.push_back( p );
}
for( unsigned c=0; c<m_aGameCommands.size(); c++ ) for( unsigned c=0; c<m_aGameCommands.size(); c++ )
@@ -511,15 +495,7 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice )
} }
vector<PlayerNumber> vpns; vector<PlayerNumber> vpns;
if( SHARED_SELECTION ) GetActiveElementPlayerNumbers( vpns );
{
vpns.push_back( PLAYER_1 );
}
else
{
FOREACH_HumanPlayer( p )
vpns.push_back( p );
}
Message msg("PreSwitchPage"); Message msg("PreSwitchPage");
msg.SetParam( "OldPageIndex", (int)oldPage ); msg.SetParam( "OldPageIndex", (int)oldPage );
@@ -760,15 +736,7 @@ void ScreenSelectMaster::MenuStart( const InputEventPlus &input )
void ScreenSelectMaster::TweenOnScreen() void ScreenSelectMaster::TweenOnScreen()
{ {
vector<PlayerNumber> vpns; vector<PlayerNumber> vpns;
if( SHARED_SELECTION ) GetActiveElementPlayerNumbers( vpns );
{
vpns.push_back( PLAYER_1 );
}
else
{
FOREACH_ENUM( PlayerNumber, p )
vpns.push_back( p );
}
if( SHOW_ICON ) if( SHOW_ICON )
{ {
@@ -812,15 +780,7 @@ void ScreenSelectMaster::TweenOffScreen()
ScreenSelect::TweenOffScreen(); ScreenSelect::TweenOffScreen();
vector<PlayerNumber> vpns; vector<PlayerNumber> vpns;
if( SHARED_SELECTION ) GetActiveElementPlayerNumbers( vpns );
{
vpns.push_back( PLAYER_1 );
}
else
{
FOREACH_HumanPlayer( p )
vpns.push_back( p );
}
for( unsigned c=0; c<m_aGameCommands.size(); c++ ) for( unsigned c=0; c<m_aGameCommands.size(); c++ )
{ {