From dd82dc90fc659c41b59d28029108711754cd6f05 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 21 May 2012 22:04:02 -0500 Subject: [PATCH] [Steps] Modified HasSignificantTimingChanges; the following now disqualify when using a CMod: Stops, Delays, Warps, Speed Changes, Scroll Changes. Songs with a non-constant BPM will only disqualify if the High/Low difference is greater than 3.00. --- Docs/Changelog_sm5.txt | 4 ++++ src/Steps.cpp | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 2dca08f66d..71a63e91c1 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -16,6 +16,10 @@ StepMania 5.0 ???? ?? | 20120??? * [ScreenEdit] Allow a new way of creating and modifying attacks using the Area Menu. Note: Using the C or V keys is no longer allowed for attacks. It will simplify things for later. [Wolfman2000] +* [Steps] Modified HasSignificantTimingChanges; the following now disqualify + when using a CMod: Stops, Delays, Warps, Speed Changes, Scroll Changes. + Songs with a non-constant BPM will only disqualify if the High/Low difference + is greater than 3.00. [AJ] 2012/05/19 ---------- diff --git a/src/Steps.cpp b/src/Steps.cpp index 010bd8c727..83f0ab3445 100644 --- a/src/Steps.cpp +++ b/src/Steps.cpp @@ -501,16 +501,17 @@ void Steps::SetMeter( int meter ) bool Steps::HasSignificantTimingChanges() const { - if( m_Timing.HasStops() || m_Timing.HasDelays() ) + if( m_Timing.HasStops() || m_Timing.HasDelays() || m_Timing.HasWarps() || + m_Timing.HasSpeedChanges() || m_Timing.HasScrollChanges() ) return true; - - /* TODO: Deal with DisplayBPM here...if possible? - * Song's version may still be useful. */ - - else if( m_Timing.HasBpmChanges() || m_Timing.HasWarps() || m_Timing.HasSpeedChanges() ) + + if( m_Timing.HasBpmChanges() ) { - return true; + // check to see if these changes are significant. + if( (GetMaxBPM() - GetMinBPM()) > 3.000f ) + return true; } + return false; }