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

Added ComboContinuesBetweenSongs back in. And if that line in ResetStageStatistics is committed as FOREACH_HumanPlayer, I'm going to punch git.

Browse Source
This commit is contained in:
Kyzentun
2014-02-16 11:43:28 -07:00
parent 3adfce9857
commit 3c7bb93bbc
5 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/GameState.cpp
+24
View File
@@ -795,6 +795,13 @@ void GameState::FinishStage()
}
}
// Save the current combo to the profiles so it can be used for ComboContinuesBetweenSongs.
FOREACH_HumanPlayer( p )
{
Profile* pProfile = PROFILEMAN->GetProfile(p);
pProfile->m_iCurrentCombo = STATSMAN->m_CurStageStats.m_player[p].m_iCurCombo;
}
if( m_bDemonstrationOrJukebox )
return;
@@ -926,7 +933,24 @@ void GameState::ResetMusicStatistics()
void GameState::ResetStageStatistics()
{
StageStats OldStats = STATSMAN->m_CurStageStats;
STATSMAN->m_CurStageStats = StageStats();
if( PREFSMAN->m_bComboContinuesBetweenSongs )
{
FOREACH_PlayerNumber( p )
{
bool FirstSong = m_iCurrentStageIndex == 0;
if( FirstSong )
{
Profile* pProfile = PROFILEMAN->GetProfile(p);
STATSMAN->m_CurStageStats.m_player[p].m_iCurCombo = pProfile->m_iCurrentCombo;
}
else
{
STATSMAN->m_CurStageStats.m_player[p].m_iCurCombo = OldStats.m_player[p].m_iCurCombo;
}
}
}
RemoveAllActiveAttacks();
FOREACH_PlayerNumber( p )