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

use empty TimingData in Steps to signify fallback on Song timing.

Browse Source 
This required using the new Steps::GetTimingData function and the allowEmpty
parameter to TimingData::TidyUpData when appropriate, as well as clearing the
TimingData to remove step timing rather than coping the song timing over it.

Fixes some odd editor behavior when changing song timing, and is overall a
slightly less hacky way of doing things.
This commit is contained in:
Devin J. Pohly
2013-01-23 14:51:18 -05:00
parent 0ae7b0da85
commit ce507b9800
18 changed files with 66 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Song.cpp
+6 -5
View File
@@ -198,7 +198,7 @@ Steps *Song::CreateSteps()
void Song::InitSteps(Steps *pSteps)
{
pSteps->m_Timing = this->m_SongTiming;
// TimingData is initially empty (i.e. defaults to song timing)
pSteps->m_sAttackString = this->m_sAttackString;
pSteps->m_Attacks = this->m_Attacks;
pSteps->SetDisplayBPM(this->m_DisplayBPMType);
@@ -541,7 +541,7 @@ void Song::TidyUpData( bool fromCache, bool /* duringCache */ )
FOREACH( Steps *, m_vpSteps, s )
{
(*s)->m_Timing.TidyUpData( false );
(*s)->m_Timing.TidyUpData( true );
}
/* Generate these before we autogen notes, so the new notes can inherit
@@ -889,9 +889,9 @@ void Song::ReCalculateRadarValuesAndLastSecond(bool fromCache, bool duringCache)
if( tempNoteData.GetLastRow() != 0 )
{
localFirst = min(localFirst,
pSteps->m_Timing.GetElapsedTimeFromBeat(tempNoteData.GetFirstBeat()));
pSteps->GetTimingData()->GetElapsedTimeFromBeat(tempNoteData.GetFirstBeat()));
localLast = max(localLast,
pSteps->m_Timing.GetElapsedTimeFromBeat(tempNoteData.GetLastBeat()));
pSteps->GetTimingData()->GetElapsedTimeFromBeat(tempNoteData.GetLastBeat()));
}
wipe_notedata:
if (duringCache)
@@ -1587,7 +1587,8 @@ bool Song::IsEditAlreadyLoaded( Steps* pSteps ) const
bool Song::IsStepsUsingDifferentTiming(Steps *pSteps) const
{
return pSteps->m_Timing != this->m_SongTiming;
// XXX This no longer depends on Song at all
return !pSteps->m_Timing.empty();
}
bool Song::HasSignificantBpmChangesOrStops() const