From 0ff2505831f9e348441092d4e64e5dbde2b4cece Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 15 Jan 2006 08:15:27 +0000
Subject: [PATCH] PlayerNumber(0) -> PLAYER_1

---
 stepmania/src/OptionRow.cpp           |  4 ++--
 stepmania/src/ScreenOptionsMaster.cpp |  2 +-
 stepmania/src/ScreenSelectMaster.cpp  | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp
index 3161d4d779..139d553934 100644
--- a/stepmania/src/OptionRow.cpp
+++ b/stepmania/src/OptionRow.cpp
@@ -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 )
diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index e3709c00de..9c05e7703c 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -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 );
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 5f49e06140..77e6dcaacf 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -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
 	{