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

PLAYER_COLOR -> command

Browse Source
This commit is contained in:
Glenn Maynard
2005-08-31 03:41:21 +00:00
parent 8947fed4e8
commit bffd30aafd
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CommonMetrics.cpp
+2 -2
View File
@@ -7,13 +7,13 @@
#include "GameState.h"
CString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%d",int(p+1)); }
static CString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%dCommand",int(p+1)); }
ThemeMetric<CString> INITIAL_SCREEN ("Common","InitialScreen", true); // always reevaluate metric
ThemeMetric<CString> FIRST_ATTRACT_SCREEN ("Common","FirstAttractScreen");
ThemeMetric<CString> DEFAULT_MODIFIERS ("Common","DefaultModifiers" );
ThemeMetric<CString> DEFAULT_CPU_MODIFIERS ("Common","DefaultCpuModifiers" );
ThemeMetric1D<RageColor> PLAYER_COLOR ("Common",PLAYER_COLOR_NAME,NUM_PLAYERS);
ThemeMetric1D<apActorCommands> PLAYER_COLOR ("Common",PLAYER_COLOR_NAME,NUM_PLAYERS);
ThemeMetric<CString> WINDOW_TITLE ("Common","WindowTitle");
ThemeMetric<int> MAX_COURSE_ENTRIES_BEFORE_VARIOUS ("Common","MaxCourseEntriesBeforeShowVarious");
ThemeMetric<float> TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds");
stepmania/src/CommonMetrics.h
+1 -1
View File
@@ -48,7 +48,7 @@ extern ThemeMetric<CString> INITIAL_SCREEN;
extern ThemeMetric<CString> FIRST_ATTRACT_SCREEN;
extern ThemeMetric<CString> DEFAULT_MODIFIERS;
extern ThemeMetric<CString> DEFAULT_CPU_MODIFIERS;
extern ThemeMetric1D<RageColor> PLAYER_COLOR;
extern ThemeMetric1D<apActorCommands> PLAYER_COLOR;
extern ThemeMetric<CString> WINDOW_TITLE;
extern ThemeMetric<int> MAX_COURSE_ENTRIES_BEFORE_VARIOUS;
extern ThemeMetric<float> TICK_EARLY_SECONDS;
stepmania/src/ScoreDisplayLifeTime.cpp
+1 -1
View File
@@ -33,10 +33,10 @@ void ScoreDisplayLifeTime::Init( const PlayerState* pPlayerState, const PlayerSt
ActorUtil::OnCommand( m_sprFrame, sType );
m_textTimeRemaining.LoadFromFont( THEME->GetPathF(sType, "TimeRemaining") );
m_textTimeRemaining.SetDiffuse( PLAYER_COLOR.GetValue(pn) );
m_textTimeRemaining.SetName( "TimeRemaining" );
this->AddChild( &m_textTimeRemaining );
ActorUtil::OnCommand( m_textTimeRemaining, sType );
m_textTimeRemaining.RunCommands( PLAYER_COLOR.GetValue(pn) );
m_textDeltaSeconds.LoadFromFont( THEME->GetPathF(sType,"DeltaSeconds") );
m_textDeltaSeconds.SetName( "DeltaSeconds" );
stepmania/src/ScoreDisplayNormal.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ void ScoreDisplayNormal::Init( const PlayerState* pPlayerState, const PlayerStag
// TODO: Remove use of PlayerNumber.
PlayerNumber pn = pPlayerState->m_PlayerNumber;
m_text.SetDiffuse( PLAYER_COLOR.GetValue(pn) );
m_text.RunCommands( PLAYER_COLOR.GetValue(pn) );
}
void ScoreDisplayNormal::SetScore( int iNewScore )
stepmania/src/ScoreDisplayOni.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ void ScoreDisplayOni::Init( const PlayerState* pPlayerState, const PlayerStageSt
// TODO: Remove use of PlayerNumber.
PlayerNumber pn = pPlayerState->m_PlayerNumber;
m_text.SetDiffuse( PLAYER_COLOR.GetValue(pn) );
m_text.RunCommands( PLAYER_COLOR.GetValue(pn) );
}
stepmania/src/ScreenSelectMusic.cpp
+1 -1
View File
@@ -259,7 +259,7 @@ 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].SetDiffuse( PLAYER_COLOR.GetValue(p) );
m_textHighScore[p].RunCommands( PLAYER_COLOR.GetValue(p) );
SET_XY( m_textHighScore[p] );
this->AddChild( &m_textHighScore[p] );
}