From 33239f43e02caefb2595287f4d98591c5429a6e2 Mon Sep 17 00:00:00 2001 From: Chris Gomez Date: Fri, 28 Feb 2003 04:31:36 +0000 Subject: [PATCH] Add in speed modifier codes from EuroMix2 Zoom dance points in ScreenEval if >10000 --- stepmania/Themes/default/metrics.ini | 5 +++-- stepmania/src/ScreenEvaluation.cpp | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 64cf5ae9f6..5401fb6ada 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -412,6 +412,7 @@ PercentBaseP1X=120 PercentBaseP2X=572 DancePointP1X=170 DancePointP2X=622 +DancePointDisplayWidth=155 //this seems to work well with default PercentBaseY=134 JudgeLabelsX=320 MarvelousP1X=230 @@ -743,8 +744,8 @@ Right=Up,Down,Left,Right Shuffle=Down,Up,Down,Up SuperShuffle=Down,Up,Left,Right NextTransform= -NextScrollSpeed= -PreviousScrollSpeed= +NextScrollSpeed=Up,Up,Left,Down,Left +PreviousScrollSpeed=Down,Down,Right,Up,Right NextAccel=Left,Right,Down,Up NextEffect=Left,Down,Right NextAppearance=Left,Up,Right diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 127e788eb5..68c1370289 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -38,6 +38,7 @@ #define GRADE_Y THEME->GetMetricF("ScreenEvaluation","GradeY") #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_WIDTH THEME->GetMetricF("ScreenEvaluation","DancePointDisplayWidth") #define PERCENT_BASE_Y THEME->GetMetricF("ScreenEvaluation","PercentBaseY") #define JUDGE_LABELS_X THEME->GetMetricF("ScreenEvaluation","JudgeLabelsX") #define MARVELOUS_X(o,p) THEME->GetMetricF("ScreenEvaluation",ssprintf("Marvelous%sP%dX",o?"Oni":"",p+1)) @@ -305,6 +306,8 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary ) m_bTryExtraStage = GAMESTATE->HasEarnedExtraStage() && m_ResultMode==RM_ARCADE_STAGE; + + float fDancePointWidth = DANCE_POINT_WIDTH; // // Init ResultMode-specific displays @@ -347,7 +350,11 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary ) } if(PREFSMAN->m_bDancePointsForOni) + { 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 { stageStats.iPossibleDancePoints[p] = max( 1, stageStats.iPossibleDancePoints[p] );