From fc72f2de90c857347097a06f6171e8675ee721d0 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 16 May 2011 10:56:00 -0400 Subject: [PATCH] [splittiming] Prepare the editor. --- Themes/_fallback/Languages/en.ini | 2 +- src/ScreenEdit.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 4267bfe208..2c5192464e 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1231,7 +1231,7 @@ Enter a new Time Signature denominator value.=Enter the note value that represen Enter a new Tickcount value.=Enter a new Tickcount value. Enter a new Combo value.=Enter a new Combo value. Enter a new Label value.=Enter a name for this section of the chart. -Enter a new Warp value.=Enter the beat you will warp to when you reach this point. +Enter a new Warp value.=Enter the number of beats you will warp over. Enter a new Speed percent value.=Enter the ratio for speed scrolling.\n\n1 is the default scroll. Enter a new Speed wait value.=Enter how long in seconds/beats it takes to change.\n\n0 is instant. Enter a new Speed mode value.=Enter how this segment is handled.\n\nType "0" for beats, "1" for seconds. diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp index 95e51299b0..aa3dd8ca3f 100644 --- a/src/ScreenEdit.cpp +++ b/src/ScreenEdit.cpp @@ -2763,8 +2763,11 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM ) else if ( SM == SM_BackFromWarpChange ) { float fWarp = StringToFloat( ScreenTextEntry::s_sLastAnswer ); - GetAppropriateTiming().SetWarpAtBeat( GetBeat(), fWarp ); - SetDirty( true ); + if( fWarp > 0 ) + { + GetAppropriateTiming().SetWarpAtBeat( GetBeat(), fWarp ); + SetDirty( true ); + } } else if( SM == SM_BackFromSpeedPercentChange ) {