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

Loop / goodie combo.

Browse Source
This commit is contained in:
Jason Felds
2013-04-28 23:31:57 -04:00
parent 1214095193
commit db080e7d8e
1 changed files with 162 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TrailUtil.cpp
+8 -3
View File
@@ -5,7 +5,7 @@
#include "XmlFile.h" #include "XmlFile.h"
#include "GameManager.h" #include "GameManager.h"
#include "Song.h" #include "Song.h"
#include <numeric>
int TrailUtil::GetNumSongs( const Trail *pTrail ) int TrailUtil::GetNumSongs( const Trail *pTrail )
{ {
@@ -14,10 +14,15 @@ int TrailUtil::GetNumSongs( const Trail *pTrail )
float TrailUtil::GetTotalSeconds( const Trail *pTrail ) float TrailUtil::GetTotalSeconds( const Trail *pTrail )
{ {
#ifdef MACOSX
float fSecs = 0; float fSecs = 0;
FOREACH_CONST( TrailEntry, pTrail->m_vEntries, e ) for (TrailEntry const &e : pTrail->m_vEntries)
fSecs += e->pSong->m_fMusicLengthSeconds; fSecs += e.pSong->m_fMusicLengthSeconds;
return fSecs; 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
} }
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////