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

Add the other segments for consistency sake.

Browse Source
This commit is contained in:
Jason Felds
2011-01-19 01:15:44 -05:00
parent b4598ae645
commit 3c826a660d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+6
View File
@@ -488,12 +488,18 @@ void TimingData::GetBeatAndBPSFromElapsedTimeNoOffset( float fElapsedTime, float
vector<BPMSegment> vBPMS = m_BPMSegments; vector<BPMSegment> vBPMS = m_BPMSegments;
vector<StopSegment> vSS = m_StopSegments; vector<StopSegment> vSS = m_StopSegments;
vector<WarpSegment> vWS = m_WarpSegments; vector<WarpSegment> vWS = m_WarpSegments;
vector<TimeSignatureSegment> vTSS = m_vTimeSignatureSegments;
vector<TickcountSegment> vTS = m_TickcountSegments;
sort( vBPMS.begin(), vBPMS.end() ); sort( vBPMS.begin(), vBPMS.end() );
sort( vSS.begin(), vSS.end() ); sort( vSS.begin(), vSS.end() );
sort( vWS.begin(), vWS.end() ); sort( vWS.begin(), vWS.end() );
sort( vTTS.begin(), vTTS.end() );
sort( vTS.begin(), vTS.end() );
ASSERT_M( vBPMS == m_BPMSegments, "The BPM segments were not sorted!" ); ASSERT_M( vBPMS == m_BPMSegments, "The BPM segments were not sorted!" );
ASSERT_M( vSS == m_StopSegments, "The Stop segments were not sorted!" ); ASSERT_M( vSS == m_StopSegments, "The Stop segments were not sorted!" );
ASSERT_M( vWS == m_WarpSegments, "The Warp segments were not sorted!" ); ASSERT_M( vWS == m_WarpSegments, "The Warp segments were not sorted!" );
ASSERT_M( vTTS == m_vTimeSignatureSegments, "The Time Signature segments were not sorted!" );
ASSERT_M( vTS == m_TickcountSegments, "The Tickcount segments were not sorted!" );
FAIL_M( ssprintf("Failed to find the appropriate segment for elapsed time %f.", fTime) ); FAIL_M( ssprintf("Failed to find the appropriate segment for elapsed time %f.", fTime) );
} }