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

Use the standard library when possible.

Browse Source
This commit is contained in:
Jason Felds
2013-04-28 23:20:16 -04:00
parent fdb26b7121
commit b3126e1705
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PlayerStageStats.cpp
+12 -7
View File
@@ -5,6 +5,7 @@
#include "Foreach.h" #include "Foreach.h"
#include "LuaManager.h" #include "LuaManager.h"
#include <float.h> #include <float.h>
#include <numeric>
#include "GameState.h" #include "GameState.h"
#include "Course.h" #include "Course.h"
#include "Steps.h" #include "Steps.h"
@@ -70,8 +71,8 @@ void PlayerStageStats::Init()
void PlayerStageStats::AddStats( const PlayerStageStats& other ) void PlayerStageStats::AddStats( const PlayerStageStats& other )
{ {
m_bJoined = other.m_bJoined; m_bJoined = other.m_bJoined;
FOREACH_CONST( Steps*, other.m_vpPossibleSteps, s ) for (Steps *s : other.m_vpPossibleSteps)
m_vpPossibleSteps.push_back( *s ); m_vpPossibleSteps.push_back( s );
m_iStepsPlayed += other.m_iStepsPlayed; m_iStepsPlayed += other.m_iStepsPlayed;
m_fAliveSeconds += other.m_fAliveSeconds; m_fAliveSeconds += other.m_fAliveSeconds;
m_bFailed |= other.m_bFailed; m_bFailed |= other.m_bFailed;
@@ -313,12 +314,16 @@ int PlayerStageStats::GetLessonScoreActual() const
int PlayerStageStats::GetLessonScoreNeeded() const int PlayerStageStats::GetLessonScoreNeeded() const
{ {
float fScore = 0; #ifdef MACOSX
float score = 0;
FOREACH_CONST( Steps*, m_vpPossibleSteps, steps ) for (Steps const *steps : m_vpPossibleSteps)
fScore += (*steps)->GetRadarValues( PLAYER_1 ).m_Values.v.fNumTapsAndHolds; score += steps->GetRadarValues( PLAYER_1 ).m_Values.v.fNumTapsAndHolds;
#else
return lrintf( fScore * LESSON_PASS_THRESHOLD ); float score = std::accumulate(m_vpPossibleSteps.begin(), m_vpPossibleSteps.end(), 0.f,
[](float total, Steps const *steps) { return total += steps->GetRadarValues(PLAYER_1).m_Values.v.fNumTapsAndHolds; });
#endif
return lrintf( score * LESSON_PASS_THRESHOLD );
} }
void PlayerStageStats::ResetScoreForLesson() void PlayerStageStats::ResetScoreForLesson()