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

I don't like shadowed variables.

Browse Source
This commit is contained in:
Jason Felds
2011-07-04 21:22:05 -04:00
parent 0455ffaa36
commit e19a210926
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingSegments.cpp
+10 -4
View File
@@ -250,18 +250,24 @@ void SpeedSegment::SetUnit(const int i)
this->unit = static_cast<unsigned short>(i); this->unit = static_cast<unsigned short>(i);
} }
void SpeedSegment::Scale( int start, int length, int newLength ) void SpeedSegment::Scale( int start, int oldLength, int newLength )
{ {
if( GetUnit() == 0 ) if( GetUnit() == 0 )
{ {
// XXX: this function is duplicated, there should be a better way // XXX: this function is duplicated, there should be a better way
float startBeat = GetBeat(); float startBeat = GetBeat();
float endBeat = startBeat + GetLength(); float endBeat = startBeat + GetLength();
float newStartBeat = ScalePosition( NoteRowToBeat(start), NoteRowToBeat(length), NoteRowToBeat(newLength), startBeat ); float newStartBeat = ScalePosition(NoteRowToBeat(start),
float newEndBeat = ScalePosition( NoteRowToBeat(start), NoteRowToBeat(length), NoteRowToBeat(newLength), endBeat ); NoteRowToBeat(oldLength),
NoteRowToBeat(newLength),
startBeat);
float newEndBeat = ScalePosition(NoteRowToBeat(start),
NoteRowToBeat(oldLength),
NoteRowToBeat(newLength),
endBeat);
SetLength( newEndBeat - newStartBeat ); SetLength( newEndBeat - newStartBeat );
} }
TimingSegment<SpeedSegment>::Scale( start, length, newLength ); TimingSegment<SpeedSegment>::Scale( start, oldLength, newLength );
} }
bool SpeedSegment::operator<( const SpeedSegment &other ) const bool SpeedSegment::operator<( const SpeedSegment &other ) const