Rename for clarity (when using dance points it's not exactly a percent)
This commit is contained in:
@@ -412,9 +412,9 @@ GradeP1X=94
|
|||||||
GradeP2X=546
|
GradeP2X=546
|
||||||
GradeY=100
|
GradeY=100
|
||||||
PercentBaseP1X=120
|
PercentBaseP1X=120
|
||||||
PercentBaseDPP1X=170
|
|
||||||
PercentBaseP2X=572
|
PercentBaseP2X=572
|
||||||
PercentBaseDPP2X=622
|
DancePointP1X=170
|
||||||
|
DancePointP2X=622
|
||||||
PercentBaseY=134
|
PercentBaseY=134
|
||||||
JudgeLabelsX=320
|
JudgeLabelsX=320
|
||||||
MarvelousP1X=230
|
MarvelousP1X=230
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
#define GRADE_X( p ) THEME->GetMetricF("ScreenEvaluation",ssprintf("GradeP%dX",p+1))
|
#define GRADE_X( p ) THEME->GetMetricF("ScreenEvaluation",ssprintf("GradeP%dX",p+1))
|
||||||
#define GRADE_Y THEME->GetMetricF("ScreenEvaluation","GradeY")
|
#define GRADE_Y THEME->GetMetricF("ScreenEvaluation","GradeY")
|
||||||
#define PERCENT_BASE_X( p ) THEME->GetMetricF("ScreenEvaluation",ssprintf("PercentBaseP%dX",p+1))
|
#define PERCENT_BASE_X( p ) THEME->GetMetricF("ScreenEvaluation",ssprintf("PercentBaseP%dX",p+1))
|
||||||
#define PERCENT_BASE_DP_X( p ) THEME->GetMetricF("ScreenEvaluation",ssprintf("PercentBaseDPP%dX",p+1))
|
#define DANCE_POINT_X( p ) THEME->GetMetricF("ScreenEvaluation",ssprintf("DancePointP%dX",p+1))
|
||||||
#define PERCENT_BASE_Y THEME->GetMetricF("ScreenEvaluation","PercentBaseY")
|
#define PERCENT_BASE_Y THEME->GetMetricF("ScreenEvaluation","PercentBaseY")
|
||||||
#define JUDGE_LABELS_X THEME->GetMetricF("ScreenEvaluation","JudgeLabelsX")
|
#define JUDGE_LABELS_X THEME->GetMetricF("ScreenEvaluation","JudgeLabelsX")
|
||||||
#define MARVELOUS_X(o,p) THEME->GetMetricF("ScreenEvaluation",ssprintf("Marvelous%sP%dX",o?"Oni":"",p+1))
|
#define MARVELOUS_X(o,p) THEME->GetMetricF("ScreenEvaluation",ssprintf("Marvelous%sP%dX",o?"Oni":"",p+1))
|
||||||
@@ -328,7 +328,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
|
|||||||
|
|
||||||
m_textOniPercentLarge[p].LoadFromNumbers( THEME->GetPathTo("Numbers","evaluation percent numbers") );
|
m_textOniPercentLarge[p].LoadFromNumbers( THEME->GetPathTo("Numbers","evaluation percent numbers") );
|
||||||
m_textOniPercentLarge[p].TurnShadowOff();
|
m_textOniPercentLarge[p].TurnShadowOff();
|
||||||
m_textOniPercentLarge[p].SetXY( (PREFSMAN->m_bDancePointsForOni ? PERCENT_BASE_DP_X(p) : PERCENT_BASE_X(p) ), PERCENT_BASE_Y );
|
m_textOniPercentLarge[p].SetXY( (PREFSMAN->m_bDancePointsForOni ? DANCE_POINT_X(p) : PERCENT_BASE_X(p) ), PERCENT_BASE_Y );
|
||||||
m_textOniPercentLarge[p].SetHorizAlign( Actor::align_right );
|
m_textOniPercentLarge[p].SetHorizAlign( Actor::align_right );
|
||||||
m_textOniPercentLarge[p].SetVertAlign( Actor::align_bottom );
|
m_textOniPercentLarge[p].SetVertAlign( Actor::align_bottom );
|
||||||
m_textOniPercentLarge[p].SetEffectGlowShift( 2.5f );
|
m_textOniPercentLarge[p].SetEffectGlowShift( 2.5f );
|
||||||
|
|||||||
Reference in New Issue
Block a user