...did I do this merge right?

This commit is contained in:
Jason Felds
2011-12-11 19:31:19 -05:00
2 changed files with 8 additions and 1 deletions
+5
View File
@@ -8,6 +8,11 @@ ________________________________________________________________________________
StepMania 5.0 $next | 20111xxx
--------------------------------------------------------------------------------
2011/12/11
----------
* [ScreenEdit] Restore cycling the timing segments for jumping between.
The required line somehow never got replaced. [Wolfman2000]
2011/11/30
----------
* [PlayerOptions] Added IsEasierForSongAndSteps(Song,Steps,PlayerNumber) and
+3 -1
View File
@@ -1571,12 +1571,14 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
{
int tmp = enum_add2( this->currentCycleSegment, -1 );
wrap( *ConvertValue<int>(&tmp), NUM_TimingSegmentType );
currentCycleSegment = (TimingSegmentType)tmp;
break;
}
}
case EDIT_BUTTON_CYCLE_SEGMENT_RIGHT:
{
int tmp = enum_add2( this->currentCycleSegment, +1 );
wrap( *ConvertValue<int>(&tmp), NUM_TimingSegmentType );
currentCycleSegment = (TimingSegmentType)tmp;
break;
}
case EDIT_BUTTON_SCROLL_SPEED_UP: