fix judgment from previous song hangs around when switching course songs
This commit is contained in:
@@ -74,10 +74,10 @@ Judgment::Judgment()
|
||||
|
||||
void Judgment::Reset()
|
||||
{
|
||||
m_sprJudgment.SetDiffuse( RageColor(1,1,1,0) );
|
||||
m_sprJudgment.StopTweening();
|
||||
m_sprJudgment.FinishTweening();
|
||||
m_sprJudgment.SetXY( 0, 0 );
|
||||
m_sprJudgment.SetEffectNone();
|
||||
m_sprJudgment.SetHidden( true );
|
||||
}
|
||||
|
||||
void Judgment::SetJudgment( TapNoteScore score )
|
||||
@@ -86,6 +86,8 @@ void Judgment::SetJudgment( TapNoteScore score )
|
||||
|
||||
Reset();
|
||||
|
||||
m_sprJudgment.SetHidden( false );
|
||||
|
||||
switch( score )
|
||||
{
|
||||
case TNS_MARVELOUS:
|
||||
|
||||
+12
-12
@@ -39,23 +39,23 @@
|
||||
|
||||
CachedThemeMetricF GRAY_ARROWS_Y_STANDARD ("Player","ReceptorArrowsYStandard");
|
||||
CachedThemeMetricF GRAY_ARROWS_Y_REVERSE ("Player","ReceptorArrowsYReverse");
|
||||
#define JUDGMENT_X( p, both_sides ) THEME->GetMetricF("Player",both_sides ? "JudgmentXOffsetBothSides" : ssprintf("JudgmentXOffsetOneSideP%d",p+1))
|
||||
#define JUDGMENT_Y THEME->GetMetricF("Player","JudgmentY")
|
||||
#define JUDGMENT_Y_REVERSE THEME->GetMetricF("Player","JudgmentYReverse")
|
||||
#define COMBO_X( p, both_sides ) THEME->GetMetricF("Player",both_sides ? "ComboXOffsetBothSides" : ssprintf("ComboXOffsetOneSideP%d",p+1))
|
||||
#define COMBO_Y THEME->GetMetricF("Player","ComboY")
|
||||
#define COMBO_Y_REVERSE THEME->GetMetricF("Player","ComboYReverse")
|
||||
#define ATTACK_DISPLAY_X( p, both_sides ) THEME->GetMetricF("Player",both_sides ? "AttackDisplayXOffsetBothSides" : ssprintf("AttackDisplayXOffsetOneSideP%d",p+1))
|
||||
#define ATTACK_DISPLAY_Y THEME->GetMetricF("Player","AttackDisplayY")
|
||||
#define ATTACK_DISPLAY_Y_REVERSE THEME->GetMetricF("Player","AttackDisplayYReverse")
|
||||
#define JUDGMENT_X( p, both_sides ) THEME->GetMetricF("Player",both_sides ? "JudgmentXOffsetBothSides" : ssprintf("JudgmentXOffsetOneSideP%d",p+1))
|
||||
#define JUDGMENT_Y THEME->GetMetricF("Player","JudgmentY")
|
||||
#define JUDGMENT_Y_REVERSE THEME->GetMetricF("Player","JudgmentYReverse")
|
||||
#define COMBO_X( p, both_sides ) THEME->GetMetricF("Player",both_sides ? "ComboXOffsetBothSides" : ssprintf("ComboXOffsetOneSideP%d",p+1))
|
||||
#define COMBO_Y THEME->GetMetricF("Player","ComboY")
|
||||
#define COMBO_Y_REVERSE THEME->GetMetricF("Player","ComboYReverse")
|
||||
#define ATTACK_DISPLAY_X( p, both_sides ) THEME->GetMetricF("Player",both_sides ? "AttackDisplayXOffsetBothSides" : ssprintf("AttackDisplayXOffsetOneSideP%d",p+1))
|
||||
#define ATTACK_DISPLAY_Y THEME->GetMetricF("Player","AttackDisplayY")
|
||||
#define ATTACK_DISPLAY_Y_REVERSE THEME->GetMetricF("Player","AttackDisplayYReverse")
|
||||
CachedThemeMetricF HOLD_JUDGMENT_Y_STANDARD ("Player","HoldJudgmentYStandard");
|
||||
CachedThemeMetricF HOLD_JUDGMENT_Y_REVERSE ("Player","HoldJudgmentYReverse");
|
||||
CachedThemeMetricI BRIGHT_GHOST_COMBO_THRESHOLD("Player","BrightGhostComboThreshold");
|
||||
CachedThemeMetricB TAP_JUDGMENTS_UNDER_FIELD ("Player","TapJudgmentsUnderField");
|
||||
CachedThemeMetricB HOLD_JUDGMENTS_UNDER_FIELD ("Player","HoldJudgmentsUnderField");
|
||||
#define START_DRAWING_AT_PIXELS THEME->GetMetricI("Player","StartDrawingAtPixels")
|
||||
#define STOP_DRAWING_AT_PIXELS THEME->GetMetricI("Player","StopDrawingAtPixels")
|
||||
#define MAX_PRO_TIMING_ERROR THEME->GetMetricI("Player","MaxProTimingError")
|
||||
#define START_DRAWING_AT_PIXELS THEME->GetMetricI("Player","StartDrawingAtPixels")
|
||||
#define STOP_DRAWING_AT_PIXELS THEME->GetMetricI("Player","StopDrawingAtPixels")
|
||||
#define MAX_PRO_TIMING_ERROR THEME->GetMetricI("Player","MaxProTimingError")
|
||||
|
||||
/* Distance to search for a note in Step(). */
|
||||
/* Units? */
|
||||
|
||||
Reference in New Issue
Block a user