Loop / goodie combo.
This commit is contained in:
+8
-3
@@ -5,7 +5,7 @@
|
||||
#include "XmlFile.h"
|
||||
#include "GameManager.h"
|
||||
#include "Song.h"
|
||||
|
||||
#include <numeric>
|
||||
|
||||
int TrailUtil::GetNumSongs( const Trail *pTrail )
|
||||
{
|
||||
@@ -14,10 +14,15 @@ int TrailUtil::GetNumSongs( const Trail *pTrail )
|
||||
|
||||
float TrailUtil::GetTotalSeconds( const Trail *pTrail )
|
||||
{
|
||||
#ifdef MACOSX
|
||||
float fSecs = 0;
|
||||
FOREACH_CONST( TrailEntry, pTrail->m_vEntries, e )
|
||||
fSecs += e->pSong->m_fMusicLengthSeconds;
|
||||
for (TrailEntry const &e : pTrail->m_vEntries)
|
||||
fSecs += e.pSong->m_fMusicLengthSeconds;
|
||||
return fSecs;
|
||||
#else
|
||||
auto const &entries = pTrail->m_vEntries;
|
||||
return std::accumulate(entries.begin(), entries.end(), 0.f, [](float total, TrailEntry const &e) { return total += e.pSong->m_fMusicLengthSeconds; });
|
||||
#endif
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user