From 75907706593cee7e94339ca6d263624d739f3bf9 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 13 Sep 2004 08:47:22 +0000 Subject: [PATCH] Fix "halfdouble". (Heavily-used feature: nobody noticed this bug for over a year. :) --- stepmania/src/NotesLoaderKSF.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp index 3e01d3bc66..a6e0e7883d 100644 --- a/stepmania/src/NotesLoaderKSF.cpp +++ b/stepmania/src/NotesLoaderKSF.cpp @@ -126,18 +126,23 @@ bool KSFLoader::LoadFromKSFFile( const CString &sPath, Steps &out, const Song &s notedata.SetNumTracks( 5 ); out.m_StepsType = STEPS_TYPE_PUMP_SINGLE; - if( sFName.Find("double") != -1 ) + + /* Check for "halfdouble" before "double". */ + if( sFName.Find("halfdouble") != -1 ) { - notedata.SetNumTracks( 10 ); - out.m_StepsType = STEPS_TYPE_PUMP_DOUBLE; - } else if( sFName.Find("_2") != -1 ) { - notedata.SetNumTracks( 10 ); - out.m_StepsType = STEPS_TYPE_PUMP_COUPLE; - } else if( sFName.Find("halfdouble") != -1 ) { notedata.SetNumTracks( 6 ); out.m_StepsType = STEPS_TYPE_PUMP_HALFDOUBLE; } - + else if( sFName.Find("double") != -1 ) + { + notedata.SetNumTracks( 10 ); + out.m_StepsType = STEPS_TYPE_PUMP_DOUBLE; + } + else if( sFName.Find("_2") != -1 ) + { + notedata.SetNumTracks( 10 ); + out.m_StepsType = STEPS_TYPE_PUMP_COUPLE; + } } int iHoldStartRow[13];