From c925e687fe5b41e1c68c90771b190e9773d1772a Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Thu, 26 May 2011 14:35:54 -0400 Subject: [PATCH] So far, so good: no breakage. Debugging confirmed that I should be able to use empty(). Let's take advantage of that before we get into step looping. --- src/AdjustSync.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/AdjustSync.cpp b/src/AdjustSync.cpp index 746d445e10..91d5f38575 100644 --- a/src/AdjustSync.cpp +++ b/src/AdjustSync.cpp @@ -57,12 +57,26 @@ void AdjustSync::ResetOriginalSyncData() { // TODO: Reset the vector if not in a song? if( s_pTimingDataOriginal == NULL ) + { s_pTimingDataOriginal = new TimingData; + s_vpTimingDataOriginal.clear(); // sanity check for now. + s_vpTimingDataOriginal.push_back(new TimingData); + } if( GAMESTATE->m_pCurSong ) + { *s_pTimingDataOriginal = GAMESTATE->m_pCurSong->m_SongTiming; + // Deal with the vector code here. + s_vpTimingDataOriginal.clear(); + s_vpTimingDataOriginal.push_back(&GAMESTATE->m_pCurSong->m_SongTiming); + // Loop through the steps. + } else + { + s_vpTimingDataOriginal.clear(); + s_vpTimingDataOriginal.push_back(new TimingData); *s_pTimingDataOriginal = TimingData(); + } s_fGlobalOffsetSecondsOriginal = PREFSMAN->m_fGlobalOffsetSeconds; ResetAutosync();