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

Merge branch 'patch-2' of https://github.com/sillybear/stepmania

Browse Source
This commit is contained in:
Kyzentun
2014-12-08 16:17:36 -07:00
parent 23d7a47c7a 67358e0ee0
commit 780c05e3f2
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenEvaluation.cpp
+14 -2
View File
@@ -624,6 +624,8 @@ void ScreenEvaluation::Init()
bool bOneHasNewTopRecord = false; bool bOneHasNewTopRecord = false;
bool bOneHasFullW1Combo = false; bool bOneHasFullW1Combo = false;
bool bOneHasFullW2Combo = false; bool bOneHasFullW2Combo = false;
bool bOneHasFullW3Combo = false;
bool bOneHasFullW4Combo = false;
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{ {
@@ -635,6 +637,12 @@ void ScreenEvaluation::Init()
bOneHasNewTopRecord = true; 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) ) if( m_pStageStats->m_player[p].FullComboOfScore(TNS_W2) )
bOneHasFullW2Combo = true; bOneHasFullW2Combo = true;
@@ -655,9 +663,13 @@ void ScreenEvaluation::Init()
{ {
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation new record") ); 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) ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation full combo "+sComboType) );
} }
else else