Finally get rid of PLAYER_COLOR. ColorP1Command and ColorP2Command no longer exist. The last thing that was being diffused with player color in the code was something in the Oni score display. I have also removed the commented code in ScreenSelectMusic.cpp (the score is hidden in _fallback anyways). Since I'm sure you can diffuse ScoreDisplayOni Numbers, but I can't seem to find any references to them in the metrics.

Themes/_fallback/metrics.ini

@@ -49,10 +49,6 @@ InitialScreen="ScreenInit"
 OverlayScreens="ScreenSystemLayer,ScreenSyncOverlay,ScreenStatsOverlay,ScreenDebugOverlay"
 # Legacy metric: Percentage Scoring shows this many decimals ( 00.00% ).
 PercentScoreDecimalPlaces=2
-# What should certain player-only elements do. we usually just color them to
-# show who's stuff is who's. you'd best leave this alone too.
-ColorP1Command=diffuse,PlayerColor(PLAYER_1)
-ColorP2Command=diffuse,PlayerColor(PLAYER_2)
 
 # 02 #
 [LightsManager]

src/CommonMetrics.cpp

@@ -8,12 +8,8 @@
 #include "ProductInfo.h"
 #include "LuaManager.h"
 
-
-static RString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%dCommand",int(p+1)); }
-
 ThemeMetric<RString>			CommonMetrics::FIRST_ATTRACT_SCREEN		("Common","FirstAttractScreen");
 ThemeMetric<RString>			CommonMetrics::DEFAULT_MODIFIERS		("Common","DefaultModifiers" );
-ThemeMetric1D<apActorCommands>		CommonMetrics::PLAYER_COLOR			("Common",PLAYER_COLOR_NAME,NUM_PLAYERS);
 LocalizedString				CommonMetrics::WINDOW_TITLE			("Common","WindowTitle");
 ThemeMetric<int>			CommonMetrics::MAX_COURSE_ENTRIES_BEFORE_VARIOUS("Common","MaxCourseEntriesBeforeShowVarious");
 ThemeMetric<float>			CommonMetrics::TICK_EARLY_SECONDS		("ScreenGameplay","TickEarlySeconds");

src/CommonMetrics.h

@@ -9,10 +9,7 @@
 #include "GameConstantsAndTypes.h"
 #include "LocalizedString.h"
 
-
-//
 // Types
-//
 class ThemeMetricDifficultiesToShow : public ThemeMetric<RString>
 {
 public:
@@ -45,14 +42,11 @@ private:
 };
 
 
-//
 // Metrics
-//
 namespace CommonMetrics
 {
 	extern ThemeMetric<RString>			FIRST_ATTRACT_SCREEN;
 	extern ThemeMetric<RString>			DEFAULT_MODIFIERS;
-	extern ThemeMetric1D<apActorCommands>		PLAYER_COLOR;	// TODO: Remove this and do all coloring in Lua
 	extern LocalizedString					WINDOW_TITLE;
 	extern ThemeMetric<int>				MAX_COURSE_ENTRIES_BEFORE_VARIOUS;
 	extern ThemeMetric<float>				TICK_EARLY_SECONDS;

src/ScoreDisplayOni.cpp

@@ -27,11 +27,6 @@ ScoreDisplayOni::ScoreDisplayOni()
 void ScoreDisplayOni::Init( const PlayerState* pPlayerState, const PlayerStageStats* pPlayerStageStats ) 
 {
 	ScoreDisplay::Init( pPlayerState, pPlayerStageStats );
-
-	// TODO: Remove use of PlayerNumber.
-	PlayerNumber pn = pPlayerState->m_PlayerNumber;
-
-	m_text.RunCommands( CommonMetrics::PLAYER_COLOR.GetValue(pn) );
 }
 
 

src/ScreenSelectMusic.cpp

@@ -192,8 +192,6 @@ void ScreenSelectMusic::Init()
 
 		m_textHighScore[p].SetName( ssprintf("ScoreP%d",p+1) );
 		m_textHighScore[p].LoadFromFont( THEME->GetPathF(m_sName,"score") );
-		//m_textHighScore[p].SetShadowLength( 0 );
-		//m_textHighScore[p].RunCommands( CommonMetrics::PLAYER_COLOR.GetValue(p) );
 		LOAD_ALL_COMMANDS_AND_SET_XY( m_textHighScore[p] );
 		this->AddChild( &m_textHighScore[p] );
 	}