Add in speed modifier codes from EuroMix2
Zoom dance points in ScreenEval if >10000
This commit is contained in:
@@ -412,6 +412,7 @@ PercentBaseP1X=120
|
|||||||
PercentBaseP2X=572
|
PercentBaseP2X=572
|
||||||
DancePointP1X=170
|
DancePointP1X=170
|
||||||
DancePointP2X=622
|
DancePointP2X=622
|
||||||
|
DancePointDisplayWidth=155 //this seems to work well with default
|
||||||
PercentBaseY=134
|
PercentBaseY=134
|
||||||
JudgeLabelsX=320
|
JudgeLabelsX=320
|
||||||
MarvelousP1X=230
|
MarvelousP1X=230
|
||||||
@@ -743,8 +744,8 @@ Right=Up,Down,Left,Right
|
|||||||
Shuffle=Down,Up,Down,Up
|
Shuffle=Down,Up,Down,Up
|
||||||
SuperShuffle=Down,Up,Left,Right
|
SuperShuffle=Down,Up,Left,Right
|
||||||
NextTransform=
|
NextTransform=
|
||||||
NextScrollSpeed=
|
NextScrollSpeed=Up,Up,Left,Down,Left
|
||||||
PreviousScrollSpeed=
|
PreviousScrollSpeed=Down,Down,Right,Up,Right
|
||||||
NextAccel=Left,Right,Down,Up
|
NextAccel=Left,Right,Down,Up
|
||||||
NextEffect=Left,Down,Right
|
NextEffect=Left,Down,Right
|
||||||
NextAppearance=Left,Up,Right
|
NextAppearance=Left,Up,Right
|
||||||
|
|||||||
@@ -38,6 +38,7 @@
|
|||||||
#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 DANCE_POINT_X( p ) THEME->GetMetricF("ScreenEvaluation",ssprintf("DancePointP%dX",p+1))
|
#define DANCE_POINT_X( p ) THEME->GetMetricF("ScreenEvaluation",ssprintf("DancePointP%dX",p+1))
|
||||||
|
#define DANCE_POINT_WIDTH THEME->GetMetricF("ScreenEvaluation","DancePointDisplayWidth")
|
||||||
#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))
|
||||||
@@ -306,6 +307,8 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
|
|||||||
GAMESTATE->HasEarnedExtraStage() &&
|
GAMESTATE->HasEarnedExtraStage() &&
|
||||||
m_ResultMode==RM_ARCADE_STAGE;
|
m_ResultMode==RM_ARCADE_STAGE;
|
||||||
|
|
||||||
|
float fDancePointWidth = DANCE_POINT_WIDTH;
|
||||||
|
|
||||||
//
|
//
|
||||||
// Init ResultMode-specific displays
|
// Init ResultMode-specific displays
|
||||||
//
|
//
|
||||||
@@ -347,7 +350,11 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(PREFSMAN->m_bDancePointsForOni)
|
if(PREFSMAN->m_bDancePointsForOni)
|
||||||
|
{
|
||||||
m_textOniPercentLarge[p].SetText( ssprintf("%d", stageStats.iActualDancePoints[p]) );
|
m_textOniPercentLarge[p].SetText( ssprintf("%d", stageStats.iActualDancePoints[p]) );
|
||||||
|
if(m_textOniPercentLarge[p].GetWidestLineWidthInSourcePixels() > fDancePointWidth)
|
||||||
|
m_textOniPercentLarge[p].SetZoomX( fDancePointWidth / (float)m_textOniPercentLarge[p].GetWidestLineWidthInSourcePixels() );
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
stageStats.iPossibleDancePoints[p] = max( 1, stageStats.iPossibleDancePoints[p] );
|
stageStats.iPossibleDancePoints[p] = max( 1, stageStats.iPossibleDancePoints[p] );
|
||||||
|
|||||||
Reference in New Issue
Block a user