actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1213 from sillybear/patch-10

Browse Source 
[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
parent 78494f857d a30befeec3
commit d22c0a2d5e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenEvaluation.cpp
+6 -5
View File
@@ -66,10 +66,11 @@ XToString( DetailLine );
#define SHOW_SCORE_AREA THEME->GetMetricB(m_sName,"ShowScoreArea") #define SHOW_SCORE_AREA THEME->GetMetricB(m_sName,"ShowScoreArea")
#define SHOW_TIME_AREA THEME->GetMetricB(m_sName,"ShowTimeArea") #define SHOW_TIME_AREA THEME->GetMetricB(m_sName,"ShowTimeArea")
#define SHOW_RECORDS_AREA THEME->GetMetricB(m_sName,"ShowRecordsArea") #define SHOW_RECORDS_AREA THEME->GetMetricB(m_sName,"ShowRecordsArea")
#define PLAYER_OPTIONS_HIDE_FAIL_TYPE THEME->GetMetricB(m_sName,"PlayerOptionsHideFailType") #define PLAYER_OPTIONS_HIDE_FAIL_TYPE THEME->GetMetricB(m_sName,"PlayerOptionsHideFailType")
#define PLAYER_OPTIONS_SEPARATOR THEME->GetMetric (m_sName,"PlayerOptionsSeparator") #define PLAYER_OPTIONS_SEPARATOR THEME->GetMetric (m_sName,"PlayerOptionsSeparator")
#define CHECKPOINTS_WITH_JUDGMENTS THEME->GetMetricB(m_sName,"CheckpointsWithJudgments") #define CHECKPOINTS_WITH_JUDGMENTS THEME->GetMetricB(m_sName,"CheckpointsWithJudgments")
static ThemeMetric<TapNoteScore> g_MinScoreToMaintainCombo("Gameplay", "MinScoreToMaintainCombo");
static const int NUM_SHOWN_RADAR_CATEGORIES = 5; static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
AutoScreenMessage( SM_PlayCheer ); AutoScreenMessage( SM_PlayCheer );
@@ -675,9 +676,9 @@ void ScreenEvaluation::Init()
{ {
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation new record") ); 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")); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation full combo W4") );
} }
else if( (bOneHasFullW1Combo || bOneHasFullW2Combo || bOneHasFullW3Combo) ) else if( (bOneHasFullW1Combo || bOneHasFullW2Combo || bOneHasFullW3Combo) )
{ {