From 0b9063844e11efc6b78d6bb61d1269a096a3e9c3 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 26 Feb 2005 06:22:40 +0000
Subject: [PATCH] allow specifying the player type

---
 stepmania/Themes/default/metrics.ini | 1 +
 stepmania/src/ScreenGameplay.cpp     | 5 +++--
 stepmania/src/ScreenGameplay.h       | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index dc7a5c0ea0..3e6b14e9b8 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -1035,6 +1035,7 @@ StaticBGY=SCREEN_CENTER_Y+0
 StaticBGX=SCREEN_CENTER_X+0
 PrevScreen=@SongSelectionScreen()
 NextScreen=@GetGameplayNextScreen()
+PlayerType=Player
 InitialBackgroundBrightness=1
 BPMDisplayX=-1000
 BPMDisplayY=-1000
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 4f1a8f0cfa..ebfef85179 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -58,8 +58,8 @@
 #define SHOW_SCORE_IN_RAVE						THEME->GetMetricB(m_sName,"ShowScoreInRave")
 #define SONG_POSITION_METER_WIDTH				THEME->GetMetricF(m_sName,"SongPositionMeterWidth")
 #define PLAYER_X( p, styleType )				THEME->GetMetricF(m_sName,ssprintf("PlayerP%d%sX",p+1,StyleTypeToString(styleType).c_str()))
-static ThemeMetric<float> INITIAL_BACKGROUND_BRIGHTNESS	("ScreenGameplay","InitialBackgroundBrightness");
 
+static ThemeMetric<float> INITIAL_BACKGROUND_BRIGHTNESS	("ScreenGameplay","InitialBackgroundBrightness");
 static ThemeMetric<float> SECONDS_BETWEEN_COMMENTS	("ScreenGameplay","SecondsBetweenComments");
 static ThemeMetric<float> TICK_EARLY_SECONDS		("ScreenGameplay","TickEarlySeconds");
 
@@ -89,6 +89,7 @@ static Preference<float> g_fNetStartOffset( Options, "NetworkStartOffset",	-3.0
 REGISTER_SCREEN_CLASS( ScreenGameplay );
 ScreenGameplay::ScreenGameplay( CString sName ) : Screen(sName)
 {
+	PLAYER_TYPE.Load( sName, "PlayerType" );
 }
 
 void ScreenGameplay::Init()
@@ -823,7 +824,7 @@ void ScreenGameplay::SetupSong( PlayerNumber p, int iSongIndex )
 		NoteData nd = ndTransformed;
 		NoteDataUtil::RemoveAllTapsOfType( nd, TapNote::autoKeysound );
 		m_Player[p].Init( 
-			"Player",
+			PLAYER_TYPE,
 			GAMESTATE->m_pPlayerState[p], 
 			&STATSMAN->m_CurStageStats.m_player[p],
 			m_pLifeMeter[p], 
diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h
index acb21c090b..8dc6218456 100644
--- a/stepmania/src/ScreenGameplay.h
+++ b/stepmania/src/ScreenGameplay.h
@@ -161,6 +161,8 @@ protected:
 	BeginnerHelper	m_BeginnerHelper;
 
 	NoteData		m_CabinetLightsNoteData;
+
+	ThemeMetric<CString> PLAYER_TYPE;
 };