From dcb952fbf572c793bd84c55a6596f49c75b05118 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 25 Apr 2007 16:22:30 +0000 Subject: [PATCH] make this explicit --- stepmania/src/GameState.cpp | 2 +- stepmania/src/StatsManager.cpp | 26 +++++++++++++------------- stepmania/src/StatsManager.h | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 5d6c2ee165..4a7f0de86a 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -635,7 +635,7 @@ void GameState::CommitStageStats() return; m_bStatsCommitted = true; - STATSMAN->CommitStatsToProfiles(); + STATSMAN->CommitStatsToProfiles( &STATSMAN->m_CurStageStats ); // Update TotalPlaySeconds. int iPlaySeconds = max( 0, (int) m_timeGameStarted.GetDeltaTime() ); diff --git a/stepmania/src/StatsManager.cpp b/stepmania/src/StatsManager.cpp index aabeeae240..2ee47fbfbc 100644 --- a/stepmania/src/StatsManager.cpp +++ b/stepmania/src/StatsManager.cpp @@ -157,7 +157,7 @@ void AddPlayerStatsToProfile( Profile *pProfile, const StageStats &ss, PlayerNum } -void StatsManager::CommitStatsToProfiles() +void StatsManager::CommitStatsToProfiles( const StageStats *pSS ) { // // Add step totals. Use radarActual, since the player might have failed part way @@ -166,23 +166,23 @@ void StatsManager::CommitStatsToProfiles() // FOREACH_HumanPlayer( pn ) { - int iNumTapsAndHolds = (int) m_CurStageStats.m_player[pn].m_radarActual[RadarCategory_TapsAndHolds]; - int iNumJumps = (int) m_CurStageStats.m_player[pn].m_radarActual[RadarCategory_Jumps]; - int iNumHolds = (int) m_CurStageStats.m_player[pn].m_radarActual[RadarCategory_Holds]; - int iNumRolls = (int) m_CurStageStats.m_player[pn].m_radarActual[RadarCategory_Rolls]; - int iNumMines = (int) m_CurStageStats.m_player[pn].m_radarActual[RadarCategory_Mines]; - int iNumHands = (int) m_CurStageStats.m_player[pn].m_radarActual[RadarCategory_Hands]; - float fCaloriesBurned = m_CurStageStats.m_player[pn].m_fCaloriesBurned; + int iNumTapsAndHolds = (int) pSS->m_player[pn].m_radarActual[RadarCategory_TapsAndHolds]; + int iNumJumps = (int) pSS->m_player[pn].m_radarActual[RadarCategory_Jumps]; + int iNumHolds = (int) pSS->m_player[pn].m_radarActual[RadarCategory_Holds]; + int iNumRolls = (int) pSS->m_player[pn].m_radarActual[RadarCategory_Rolls]; + int iNumMines = (int) pSS->m_player[pn].m_radarActual[RadarCategory_Mines]; + int iNumHands = (int) pSS->m_player[pn].m_radarActual[RadarCategory_Hands]; + float fCaloriesBurned = pSS->m_player[pn].m_fCaloriesBurned; PROFILEMAN->AddStepTotals( pn, iNumTapsAndHolds, iNumJumps, iNumHolds, iNumRolls, iNumMines, iNumHands, fCaloriesBurned ); } // Update profile stats Profile* pMachineProfile = PROFILEMAN->GetMachineProfile(); - int iGameplaySeconds = (int)truncf(m_CurStageStats.m_fGameplaySeconds); + int iGameplaySeconds = (int)truncf(pSS->m_fGameplaySeconds); pMachineProfile->m_iTotalGameplaySeconds += iGameplaySeconds; - pMachineProfile->m_iNumTotalSongsPlayed += m_CurStageStats.m_vpPlayedSongs.size(); + pMachineProfile->m_iNumTotalSongsPlayed += pSS->m_vpPlayedSongs.size(); CHECKPOINT; FOREACH_HumanPlayer( pn ) @@ -193,13 +193,13 @@ void StatsManager::CommitStatsToProfiles() if( pPlayerProfile ) { pPlayerProfile->m_iTotalGameplaySeconds += iGameplaySeconds; - pPlayerProfile->m_iNumTotalSongsPlayed += m_CurStageStats.m_vpPlayedSongs.size(); + pPlayerProfile->m_iNumTotalSongsPlayed += pSS->m_vpPlayedSongs.size(); } - AddPlayerStatsToProfile( pMachineProfile, m_CurStageStats, pn ); + AddPlayerStatsToProfile( pMachineProfile, *pSS, pn ); if( pPlayerProfile ) - AddPlayerStatsToProfile( pPlayerProfile, m_CurStageStats, pn ); + AddPlayerStatsToProfile( pPlayerProfile, *pSS, pn ); CHECKPOINT; } diff --git a/stepmania/src/StatsManager.h b/stepmania/src/StatsManager.h index a0d98b074d..dba13f5a55 100644 --- a/stepmania/src/StatsManager.h +++ b/stepmania/src/StatsManager.h @@ -24,7 +24,7 @@ public: void CalcAccumPlayedStageStats(); StageStats& GetAccumPlayedStageStats() { return m_AccumPlayedStageStats; } - void CommitStatsToProfiles(); + static void CommitStatsToProfiles( const StageStats *pSS ); void UnjoinPlayer( PlayerNumber pn );