From aebf23488899effe81c5159207d0a10997c5a6cd Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Fri, 8 Oct 2010 20:15:41 -0400 Subject: [PATCH 1/4] Temp fix for overlapping arrows. I think roll heads are now borked with this. Feel free to revert if this causes more problems. --- src/NoteField.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/NoteField.cpp b/src/NoteField.cpp index 9db814abbe..65c6c2b6ec 100644 --- a/src/NoteField.cpp +++ b/src/NoteField.cpp @@ -914,8 +914,14 @@ void NoteField::DrawPrimitives() switch( tn.type ) { case TapNote::empty: // no note here - //case TapNote::hold_head: - continue; // skip + { + continue; + } + case TapNote::hold_head: + { + if (tn.subType == TapNote::hold_head_roll) + continue; // skip + } } // Don't draw hidden (fully judged) steps. From 3df42d2a8e8340ddd79046822b136569ec34d428 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Fri, 8 Oct 2010 20:21:44 -0400 Subject: [PATCH 2/4] Add requested comments. --- src/NoteField.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/NoteField.cpp b/src/NoteField.cpp index 65c6c2b6ec..a7a02df59c 100644 --- a/src/NoteField.cpp +++ b/src/NoteField.cpp @@ -911,6 +911,9 @@ void NoteField::DrawPrimitives() { int i = begin->first; const TapNote &tn = begin->second; //m_pNoteData->GetTapNote(c, i); + + // Switch modified by Wolfman2000, tested by Saturn2888 + // Fixes hold head overlapping issue, but not the rolls. switch( tn.type ) { case TapNote::empty: // no note here From 9e97e9b4dcb8dede1ae4d949b328b6650824b623 Mon Sep 17 00:00:00 2001 From: Flameshadowxeroshin Date: Sat, 9 Oct 2010 16:45:05 -0500 Subject: [PATCH 3/4] Remove a non-working "fix" for now. --- src/NoteField.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/NoteField.cpp b/src/NoteField.cpp index a7a02df59c..c870bfadf4 100644 --- a/src/NoteField.cpp +++ b/src/NoteField.cpp @@ -920,11 +920,12 @@ void NoteField::DrawPrimitives() { continue; } - case TapNote::hold_head: + //The following doesn't work yet. + /*case TapNote::hold_head: { if (tn.subType == TapNote::hold_head_roll) continue; // skip - } + }*/ } // Don't draw hidden (fully judged) steps. From e7330f1f665ca843926f2624f2888bf6ad170273 Mon Sep 17 00:00:00 2001 From: Flameshadowxeroshin Date: Sat, 9 Oct 2010 16:49:46 -0500 Subject: [PATCH 4/4] make it work --- src/NoteField.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/NoteField.cpp b/src/NoteField.cpp index c870bfadf4..d0305eeb36 100644 --- a/src/NoteField.cpp +++ b/src/NoteField.cpp @@ -920,12 +920,11 @@ void NoteField::DrawPrimitives() { continue; } - //The following doesn't work yet. - /*case TapNote::hold_head: + case TapNote::hold_head: { - if (tn.subType == TapNote::hold_head_roll) + //if (tn.subType == TapNote::hold_head_roll) continue; // skip - }*/ + } } // Don't draw hidden (fully judged) steps.