actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't lose HoldNoteResult when converting to/from 2sAnd3s

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-23 17:17:24 +00:00
parent 4ad39097ef
commit 18e32dbda4
3 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteData.cpp
+12 -7
View File
@@ -601,7 +601,8 @@ void NoteData::Convert2sAnd3sToHoldNotes()
{
FOREACH_NONEMPTY_ROW_IN_TRACK( *this, t, r )
{
if( GetTapNote(t,r).type != TapNote::hold_head )
TapNote head = GetTapNote(t,r);
if( head.type != TapNote::hold_head )
continue; // skip
SetTapNote(t, r, TAP_EMPTY); // clear the hold head marker
@@ -616,7 +617,9 @@ void NoteData::Convert2sAnd3sToHoldNotes()
SetTapNote(t, j, TAP_EMPTY);
AddHoldNote( HoldNote(t, r, j) );
HoldNote hold(t, r, j);
hold.result = head.HoldResult;
AddHoldNote( hold );
break; // done searching for the end of this hold
}
}
@@ -634,11 +637,13 @@ void NoteData::ConvertHoldNotesTo2sAnd3s()
const HoldNote &hn = GetHoldNote(i);
/* If they're the same, then they got clamped together, so just ignore it. */
if( hn.iStartRow != hn.iEndRow )
{
SetTapNote( hn.iTrack, hn.iStartRow, TAP_ORIGINAL_HOLD_HEAD );
SetTapNote( hn.iTrack, hn.iEndRow, TAP_ORIGINAL_HOLD_TAIL );
}
if( hn.iStartRow == hn.iEndRow )
continue;
TapNote head = TAP_ORIGINAL_HOLD_HEAD;
head.HoldResult = hn.result;
SetTapNote( hn.iTrack, hn.iStartRow, head );
SetTapNote( hn.iTrack, hn.iEndRow, TAP_ORIGINAL_HOLD_TAIL );
}
m_HoldNotes.clear();
}