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

PlayerNumber(0) -> PLAYER_1

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-15 08:15:27 +00:00
parent cfedf33602
commit 0ff2505831
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+2 -2
View File
@@ -790,7 +790,7 @@ int OptionRow::GetOneSelection( PlayerNumber pn, bool bAllowFail ) const
int OptionRow::GetOneSharedSelection( bool bAllowFail ) const
{
return GetOneSelection( (PlayerNumber)0, bAllowFail );
return GetOneSelection( PLAYER_1, bAllowFail );
}
void OptionRow::SetOneSelection( PlayerNumber pn, int iChoice )
@@ -832,7 +832,7 @@ int OptionRow::GetChoiceInRowWithFocus( PlayerNumber pn ) const
int OptionRow::GetChoiceInRowWithFocusShared() const
{
return GetChoiceInRowWithFocus( (PlayerNumber)0 );
return GetChoiceInRowWithFocus( PLAYER_1 );
}
void OptionRow::SetChoiceInRowWithFocus( PlayerNumber pn, int iChoice )
stepmania/src/ScreenOptionsMaster.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ void ScreenOptionsMaster::Init()
{
FOREACH_PlayerNumber( pn )
GAMESTATE->m_bSideIsJoined[pn] = true;
GAMESTATE->m_MasterPlayerNumber = PlayerNumber(0);
GAMESTATE->m_MasterPlayerNumber = PLAYER_1;
}
else if( sFlag == "smnavigation" )
SetNavigation( NAV_THREE_KEY_MENU );
stepmania/src/ScreenSelectMaster.cpp
+8 -8
View File
@@ -56,7 +56,7 @@ void ScreenSelectMaster::Init()
vector<PlayerNumber> vpns;
if( SHARED_SELECTION )
{
vpns.push_back( (PlayerNumber)0 );
vpns.push_back( PLAYER_1 );
}
else
{
@@ -230,7 +230,7 @@ void ScreenSelectMaster::BeginScreen()
vector<PlayerNumber> vpns;
if( SHARED_SELECTION )
{
vpns.push_back( (PlayerNumber)0 );
vpns.push_back( PLAYER_1 );
}
else
{
@@ -261,7 +261,7 @@ void ScreenSelectMaster::HandleScreenMessage( const ScreenMessage SM )
vector<PlayerNumber> vpns;
if( SHARED_SELECTION )
{
vpns.push_back( (PlayerNumber)0 );
vpns.push_back( PLAYER_1 );
}
else
{
@@ -304,7 +304,7 @@ void ScreenSelectMaster::UpdateSelectableChoices()
vector<PlayerNumber> vpns;
if( SHARED_SELECTION )
{
vpns.push_back( (PlayerNumber)0 );
vpns.push_back( PLAYER_1 );
}
else
{
@@ -470,7 +470,7 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice )
vector<PlayerNumber> vpns;
if( SHARED_SELECTION )
{
vpns.push_back( (PlayerNumber)0 );
vpns.push_back( PLAYER_1 );
}
else
{
@@ -570,7 +570,7 @@ bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, MenuDir dir, int iNew
if( SHARED_SELECTION )
{
COMMAND( m_sprCursor[0], "Change" );
m_sprCursor[0]->SetXY( GetCursorX((PlayerNumber)0), GetCursorY((PlayerNumber)0) );
m_sprCursor[0]->SetXY( GetCursorX(PLAYER_1), GetCursorY(PLAYER_1) );
}
else
{
@@ -753,7 +753,7 @@ void ScreenSelectMaster::TweenOnScreen()
vector<PlayerNumber> vpns;
if( SHARED_SELECTION )
{
vpns.push_back( (PlayerNumber)0 );
vpns.push_back( PLAYER_1 );
}
else
{
@@ -820,7 +820,7 @@ void ScreenSelectMaster::TweenOffScreen()
vector<PlayerNumber> vpns;
if( SHARED_SELECTION )
{
vpns.push_back( (PlayerNumber)0 );
vpns.push_back( PLAYER_1 );
}
else
{