Merge pull request #1213 from sillybear/patch-10

[Announcer] Fixed a bug that keep "evaluation full combo W4" playing when a player get a Good Full Combo and a failed grade.
This commit is contained in:
Kyzentun
2016-07-02 16:48:45 -06:00
committed by GitHub
+2 -1
View File
@@ -70,6 +70,7 @@ XToString( DetailLine );
#define PLAYER_OPTIONS_SEPARATOR THEME->GetMetric (m_sName,"PlayerOptionsSeparator")
#define CHECKPOINTS_WITH_JUDGMENTS THEME->GetMetricB(m_sName,"CheckpointsWithJudgments")
static ThemeMetric<TapNoteScore> g_MinScoreToMaintainCombo("Gameplay", "MinScoreToMaintainCombo");
static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
AutoScreenMessage( SM_PlayCheer );
@@ -675,7 +676,7 @@ void ScreenEvaluation::Init()
{
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation new record") );
}
else if( bOneHasFullW4Combo && ANNOUNCER->HasSoundsFor("evaluation full combo W4") )
else if( bOneHasFullW4Combo && g_MinScoreToMaintainCombo == TNS_W4 )
{
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation full combo W4") );
}