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

Seriously, how do we remove sm-ssc.app?

Browse Source 
I can't kill this thing.
This commit is contained in:
Jason Felds
2011-07-26 13:56:23 -04:00
parent 3ac7ed85ba 8bad512433
commit 4f7bddd8cc
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+6 -18
View File
@@ -996,28 +996,16 @@ float TimingData::GetElapsedTimeFromBeatNoOffset( float fBeat ) const
float TimingData::GetDisplayedBeat( float fBeat ) const
{
const vector<TimingSegment *> &scrolls = this->allTimingSegments[SEGMENT_SCROLL];
vector<TimingSegment *>::const_iterator it = scrolls.begin(), end = scrolls.end();
float fOutBeat = 0;
for( it = it + 1; it != end; it++ )
unsigned i;
const vector<TimingSegment *> &scrolls = this->allTimingSegments[SEGMENT_SCROLL];
for( i=0; i<scrolls.size()-1; i++ )
{
ASSERT((*(it-1))->GetBeat() <= (*it)->GetBeat());
}
it = scrolls.begin();
for( ; it != end; it++ )
{
if( it+1 == end || fBeat <= (*(it+1))->GetBeat() )
{
fOutBeat += ( fBeat - (*it)->GetBeat() ) *
static_cast<ScrollSegment *>(*it)->GetRatio();
if( scrolls[i+1]->GetBeat() > fBeat )
break;
}
else
{
fOutBeat += ( (*(it+1))->GetBeat() - (*it)->GetBeat() ) *
static_cast<ScrollSegment *>(*it)->GetRatio();
}
fOutBeat += (scrolls[i+1]->GetBeat() - scrolls[i]->GetBeat()) * static_cast<ScrollSegment *>(scrolls[i])->GetRatio();
}
fOutBeat += (fBeat - scrolls[i]->GetBeat()) * static_cast<ScrollSegment *>(scrolls[i])->GetRatio();
return fOutBeat;
}