Restore F9/F10 for stops in the editor.
This commit is contained in:
@@ -8,6 +8,11 @@ ________________________________________________________________________________
|
|||||||
StepMania 5.0 $next | 20111xxx
|
StepMania 5.0 $next | 20111xxx
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
2011/11/26
|
||||||
|
----------
|
||||||
|
* [ScreenEdit] Restore using F9 and F10 to adjust stops by a fixed amount.
|
||||||
|
Sorry for the delay in this. [Wolfman2000]
|
||||||
|
|
||||||
2011/11/25
|
2011/11/25
|
||||||
----------
|
----------
|
||||||
* [PlayerStageStats] Hitting a mine no longer gives you full combo when
|
* [PlayerStageStats] Hitting a mine no longer gives you full combo when
|
||||||
|
|||||||
+10
-17
@@ -1900,30 +1900,23 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
|
|||||||
fDelta *= 40;
|
fDelta *= 40;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
|
||||||
unsigned i;
|
|
||||||
// is there a StopSegment on the current row?
|
// is there a StopSegment on the current row?
|
||||||
const StopSegment *seg = GetAppropriateTiming().GetStopSegmentAtRow( GetRow() );
|
TimingData & timing = GetAppropriateTiming();
|
||||||
|
StopSegment *seg = timing.GetStopSegmentAtRow( GetRow() );
|
||||||
// a stop already exists here; change its value by the delta
|
int i = timing.GetSegmentIndexAtRow(SEGMENT_STOP, GetRow());
|
||||||
if( seg->GetRow() == GetRow() )
|
if (i == -1 || seg->GetRow() != GetRow()) // invalid
|
||||||
{
|
{
|
||||||
float fSeconds = seg->GetPause() + fDelta;
|
|
||||||
GetAppropriateTiming().AddSegment
|
|
||||||
if( i == stops.size() ) // there is no StopSegment at the current beat
|
|
||||||
{
|
|
||||||
// create a new StopSegment
|
|
||||||
if( fDelta > 0 )
|
if( fDelta > 0 )
|
||||||
GetAppropriateTiming().AddSegment( StopSegment(GetRow(), fDelta) );
|
timing.AddSegment( StopSegment(GetRow(), fDelta) );
|
||||||
}
|
}
|
||||||
else // StopSegment being modified is m_SongTiming.m_StopSegments[i]
|
else
|
||||||
{
|
{
|
||||||
StopSegment *s = static_cast<StopSegment *>(stops[i]);
|
vector<TimingSegment *> &stops = timing.GetTimingSegments(SEGMENT_STOP);
|
||||||
s->SetPause(s->GetPause() + fDelta);
|
seg->SetPause(seg->GetPause() + fDelta);
|
||||||
if( s->GetPause() <= 0 )
|
if( seg->GetPause() <= 0 )
|
||||||
stops.erase( stops.begin()+i, stops.begin()+i+1);
|
stops.erase( stops.begin()+i, stops.begin()+i+1);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
(fDelta>0 ? m_soundValueIncrease : m_soundValueDecrease).Play();
|
(fDelta>0 ? m_soundValueIncrease : m_soundValueDecrease).Play();
|
||||||
SetDirty( true );
|
SetDirty( true );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -360,6 +360,10 @@ public:
|
|||||||
void SortSegments( TimingSegmentType tst );
|
void SortSegments( TimingSegmentType tst );
|
||||||
|
|
||||||
const vector<TimingSegment*> &GetTimingSegments( TimingSegmentType tst ) const
|
const vector<TimingSegment*> &GetTimingSegments( TimingSegmentType tst ) const
|
||||||
|
{
|
||||||
|
return const_cast<TimingData *>(this)->GetTimingSegments(tst);
|
||||||
|
}
|
||||||
|
vector<TimingSegment *> &GetTimingSegments( TimingSegmentType tst )
|
||||||
{
|
{
|
||||||
return m_avpTimingSegments[tst];
|
return m_avpTimingSegments[tst];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user