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

Rename StageStats::operator+= to AddStats. (easier to grep for)

Browse Source 
Keep track of whether each stage in StageStats was an extra stage.
GAMESTATE->m_vPassedStageStats now holds all played songs,
including failed ones (renaming in a moment).
GameState::GetFinalEvalStatsAndSongs logic was weird.  Simplify.
This commit is contained in:
Glenn Maynard
2003-09-06 01:35:29 +00:00
parent 6862e69559
commit 5ef82e798b
5 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+20 -12
View File
@@ -446,23 +446,31 @@ void GameState::GetFinalEvalStatsAndSongs( StageStats& statsOut, vector<Song*>&
statsOut = StageStats();
// Show stats only for the latest 3 normal songs + passed extra stages
int iNumPassedExtraStages = GAMESTATE->IsExtraStage() ? 1 : (GAMESTATE->IsExtraStage2() ? 2 : 0);
int iNumPassedRegularSongs = GAMESTATE->m_vPassedStageStats.size() - iNumPassedExtraStages;
int iNumSongsToShow = iNumPassedExtraStages + min( iNumPassedRegularSongs, 3 );
int iNumSongsToThrowAway = GAMESTATE->m_vPassedStageStats.size() - iNumSongsToShow;
ASSERT( iNumSongsToThrowAway >= 0 );
for( int i=iNumSongsToThrowAway; i<(int)GAMESTATE->m_vPassedStageStats.size(); i++ )
int PassedRegularSongsLeft = 3;
for( int i = (int)GAMESTATE->m_vPassedStageStats.size()-1; i >= 0; --i )
{
// weight long and marathon songs
int iLengthMultiplier = SongManager::GetNumStagesForSong( GAMESTATE->m_vPassedStageStats[i].pSong );
const StageStats &s = GAMESTATE->m_vPassedStageStats[i];
statsOut += GAMESTATE->m_vPassedStageStats[i];
if( !s.OnePassed() )
continue;
if( s.StageType == StageStats::STAGE_NORMAL )
{
if( PassedRegularSongsLeft == 0 )
break;
--PassedRegularSongsLeft;
}
// weight long and marathon songs
int iLengthMultiplier = SongManager::GetNumStagesForSong( s.pSong );
statsOut.AddStats( s );
for( int p=0; p<NUM_PLAYERS; p++ )
if( IsPlayerEnabled(p) )
statsOut.iMeter[p] += GAMESTATE->m_vPassedStageStats[i].iMeter[p] * (iLengthMultiplier-1);
statsOut.iMeter[p] += s.iMeter[p] * (iLengthMultiplier-1);
vSongsOut.push_back( GAMESTATE->m_vPassedStageStats[i].pSong );
vSongsOut.insert( vSongsOut.begin(), s.pSong );
}
if(!vSongsOut.size()) return;