From 67358e0ee06fa683f918975696ed6cb1b280919b Mon Sep 17 00:00:00 2001 From: sillybear Date: Thu, 4 Dec 2014 03:01:33 +0800 Subject: [PATCH] [Announcer] Add "evaluation full combo W3" and optional "evaluation full combo W4" --- src/ScreenEvaluation.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/ScreenEvaluation.cpp b/src/ScreenEvaluation.cpp index 1d8c1a836c..4ebbe74506 100644 --- a/src/ScreenEvaluation.cpp +++ b/src/ScreenEvaluation.cpp @@ -624,7 +624,9 @@ void ScreenEvaluation::Init() bool bOneHasNewTopRecord = false; bool bOneHasFullW1Combo = false; bool bOneHasFullW2Combo = false; - + bool bOneHasFullW3Combo = false; + bool bOneHasFullW4Combo = false; + FOREACH_PlayerNumber( p ) { if(GAMESTATE->IsPlayerEnabled(p)) @@ -635,6 +637,12 @@ void ScreenEvaluation::Init() bOneHasNewTopRecord = true; } + if( m_pStageStats->m_player[p].FullComboOfScore(TNS_W4) ) + bOneHasFullW4Combo = true; + + if( m_pStageStats->m_player[p].FullComboOfScore(TNS_W3) ) + bOneHasFullW3Combo = true; + if( m_pStageStats->m_player[p].FullComboOfScore(TNS_W2) ) bOneHasFullW2Combo = true; @@ -655,9 +663,13 @@ void ScreenEvaluation::Init() { SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation new record") ); } - else if( (bOneHasFullW1Combo || bOneHasFullW2Combo) ) + else if( bOneHasFullW4Combo && ANNOUNCER->HasSoundsFor("evaluation full combo W4") ) { - RString sComboType = bOneHasFullW1Combo ? "W1" : "W2"; + SOUND->PlayOnceFromDir(ANNOUNCER->GetPathTo("evaluation full combo W4")); + } + else if( (bOneHasFullW1Combo || bOneHasFullW2Combo || bOneHasFullW3Combo) ) + { + RString sComboType = bOneHasFullW1Combo ? "W1" : ( bOneHasFullW2Combo ? "W2" : "W3" ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation full combo "+sComboType) ); } else