From 34b8b6b080dd730361a588574d73f5f43e3f82b2 Mon Sep 17 00:00:00 2001 From: Alberto Ramos Date: Wed, 21 Jul 2010 12:19:28 -0600 Subject: [PATCH] Major tweaks to notesloaderksf, |E| Tags are working as they should now. --- src/NotesLoaderKSF.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/NotesLoaderKSF.cpp b/src/NotesLoaderKSF.cpp index a68559de78..c372709d0c 100644 --- a/src/NotesLoaderKSF.cpp +++ b/src/NotesLoaderKSF.cpp @@ -456,7 +456,7 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant // CheckpointsUseTimeSignatures metric. -aj TimeSignatureSegment seg; seg.m_iStartRow = BeatToNoteRow(0.0f); - seg.m_iNumerator = iTickCount; + seg.m_iNumerator = CLAMP( iTickCount, 0, ROWS_PER_BEAT ); seg.m_iDenominator = 4; out.m_Timing.AddTimeSignatureSegment( seg ); } @@ -573,7 +573,7 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant iTickCount = (int)numTemp; TimeSignatureSegment seg; seg.m_iStartRow = BeatToNoteRow(fCurBeat); - seg.m_iNumerator = iTickCount; + seg.m_iNumerator = CLAMP( iTickCount, 0, ROWS_PER_BEAT); seg.m_iDenominator = 4; out.m_Timing.AddTimeSignatureSegment( seg ); @@ -591,7 +591,6 @@ static bool LoadGlobalData( const RString &sPath, Song &out, bool &bKIUCompliant //Finally! the |E| tag is working as it should. I can die happy now -DaisuMaster float fCurDelay = 60 / out.m_Timing.GetBPMAtBeat(fCurBeat) * (float)numTemp / iTickCount; out.m_Timing.AddStopSegment( StopSegment( BeatToNoteRow(fCurBeat), fCurDelay, true ) ); - continue; } else if (BeginsWith(NoteRowString, "|D"))