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

Do some refactoring...but doesn't solve it.

Browse Source 
Line 79 is the killer one.
It's supposed to be a vector of TimingData pointers.
Yet it compiles with the address reference.

...anyone here that can take a look?
This commit is contained in:
Jason Felds
2011-05-26 18:36:30 -04:00
parent 2d491fd0c0
commit bb5012b283
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AdjustSync.cpp
+14 -11
View File
@@ -61,7 +61,7 @@ void AdjustSync::ResetOriginalSyncData()
{
s_pTimingDataOriginal = new TimingData;
s_vpTimingDataOriginal.clear(); // sanity check for now.
s_vpTimingDataOriginal.push_back(new TimingData);
s_vpTimingDataOriginal.push_back(new TimingData());
}
if( GAMESTATE->m_pCurSong )
@@ -74,14 +74,15 @@ void AdjustSync::ResetOriginalSyncData()
const vector<Steps *>& vpSteps = GAMESTATE->m_pCurSong->GetAllSteps();
FOREACH( Steps*, const_cast<vector<Steps *>&>(vpSteps), s )
{
// the size will be original song + each step.
/* Capture each Step's timing data in the vector.
* TODO: Make this less ugly. */
s_vpTimingDataOriginal.push_back(&(*s)->m_Timing);
}
}
else
{
s_vpTimingDataOriginal.clear();
s_vpTimingDataOriginal.push_back(new TimingData);
s_vpTimingDataOriginal.push_back(new TimingData());
*s_pTimingDataOriginal = TimingData();
}
s_fGlobalOffsetSecondsOriginal = PREFSMAN->m_fGlobalOffsetSeconds;
@@ -338,10 +339,12 @@ void AdjustSync::GetSyncChangeTextSong( vector<RString> &vsAddTo )
if( GAMESTATE->m_pCurSong.Get() )
{
unsigned int iOriginalSize = vsAddTo.size();
TimingData *original = s_pTimingDataOriginal;
TimingData &testing = GAMESTATE->m_pCurSong->m_SongTiming;
{
float fOld = Quantize( AdjustSync::s_pTimingDataOriginal->m_fBeat0OffsetInSeconds, 0.001f );
float fNew = Quantize( GAMESTATE->m_pCurSong->m_SongTiming.m_fBeat0OffsetInSeconds, 0.001f );
float fOld = Quantize( original->m_fBeat0OffsetInSeconds, 0.001f );
float fNew = Quantize( testing.m_fBeat0OffsetInSeconds, 0.001f );
float fDelta = fNew - fOld;
if( fabsf(fDelta) > 0.0001f )
@@ -354,10 +357,10 @@ void AdjustSync::GetSyncChangeTextSong( vector<RString> &vsAddTo )
}
}
for( unsigned i=0; i<GAMESTATE->m_pCurSong->m_SongTiming.m_BPMSegments.size(); i++ )
for( unsigned i=0; i< testing.m_BPMSegments.size(); i++ )
{
float fOld = Quantize( AdjustSync::s_pTimingDataOriginal->m_BPMSegments[i].GetBPM(), 0.001f );
float fNew = Quantize( GAMESTATE->m_pCurSong->m_SongTiming.m_BPMSegments[i].GetBPM(), 0.001f );
float fOld = Quantize( original->m_BPMSegments[i].GetBPM(), 0.001f );
float fNew = Quantize( testing.m_BPMSegments[i].GetBPM(), 0.001f );
float fDelta = fNew - fOld;
if( fabsf(fDelta) > 0.0001f )
@@ -375,10 +378,10 @@ void AdjustSync::GetSyncChangeTextSong( vector<RString> &vsAddTo )
}
}
for( unsigned i=0; i<GAMESTATE->m_pCurSong->m_SongTiming.m_StopSegments.size(); i++ )
for( unsigned i=0; i< testing.m_StopSegments.size(); i++ )
{
float fOld = Quantize( AdjustSync::s_pTimingDataOriginal->m_StopSegments[i].m_fStopSeconds, 0.001f );
float fNew = Quantize( GAMESTATE->m_pCurSong->m_SongTiming.m_StopSegments[i].m_fStopSeconds, 0.001f );
float fOld = Quantize( original->m_StopSegments[i].m_fStopSeconds, 0.001f );
float fNew = Quantize( testing.m_StopSegments[i].m_fStopSeconds, 0.001f );
float fDelta = fNew - fOld;
if( fabsf(fDelta) > 0.0001f )