From 0ec2a536d99049745a80810e0fae52dc213364be Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 24 May 2004 04:17:19 +0000 Subject: [PATCH] TapSteps -> TapNotes --- stepmania/src/NoteData.cpp | 6 +++--- stepmania/src/NoteData.h | 4 ++-- stepmania/src/NoteDataUtil.cpp | 10 +++++----- stepmania/src/NoteDisplay.h | 2 +- stepmania/src/NoteField.cpp | 2 +- stepmania/src/ScreenEdit.cpp | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp index b53e7cf94e..1eeeeacb78 100644 --- a/stepmania/src/NoteData.cpp +++ b/stepmania/src/NoteData.cpp @@ -88,7 +88,7 @@ void NoteData::CopyRange( const NoteData* pFrom, int iFromIndexBegin, int iFromI From.To4s( *pFrom ); To.To4s( *this ); - // copy recorded TapSteps + // copy recorded TapNotes int f = iFromIndexBegin, t = iToIndexBegin; while( f<=iFromIndexEnd ) @@ -271,7 +271,7 @@ void NoteData::AddHoldNote( HoldNote add ) int iAddStartIndex = add.iStartRow; int iAddEndIndex = add.iEndRow; - // delete TapSteps under this HoldNote + // delete TapNotes under this HoldNote for( i=iAddStartIndex+1; i<=iAddEndIndex; i++ ) SetTapNote(add.iTrack, i, TAP_EMPTY); @@ -345,7 +345,7 @@ void NoteData::PruneUnusedAttacksFromMap() } // Remove all items from m_AttackMap that don't have corresponding - // TapSteps in use. + // TapNotes in use. for( TapNote tn = TAP_ATTACK_BEGIN; tn<=TAP_ATTACK_END; tn++ ) { bool bInAttackMap = m_AttackMap.find(tn) != m_AttackMap.end(); diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h index 001ebd1a39..84a5d98819 100644 --- a/stepmania/src/NoteData.h +++ b/stepmania/src/NoteData.h @@ -99,7 +99,7 @@ public: // // used in edit/record // - void AddHoldNote( HoldNote newNote ); // add note hold note merging overlapping HoldNotes and destroying TapSteps underneath + void AddHoldNote( HoldNote newNote ); // add note hold note merging overlapping HoldNotes and destroying TapNotes underneath void RemoveHoldNote( int index ); HoldNote &GetHoldNote( int index ) { ASSERT( index < (int) m_HoldNotes.size() ); return m_HoldNotes[index]; } const HoldNote &GetHoldNote( int index ) const { ASSERT( index < (int) m_HoldNotes.size() ); return m_HoldNotes[index]; } @@ -138,7 +138,7 @@ public: void LoadTransformed( const NoteData* pOriginal, int iNewNumTracks, const int iOriginalTrackToTakeFrom[] ); // -1 for iOriginalTracksToTakeFrom means no track void LoadTransformedSlidingWindow( const NoteData* pOriginal, int iNewNumTracks ); // used by autogen - // Convert between HoldNote representation and '2' and '3' markers in TapSteps + // Convert between HoldNote representation and '2' and '3' markers in TapNotes void Convert2sAnd3sToHoldNotes(); void ConvertHoldNotesTo2sAnd3s(); void To2sAnd3s( const NoteData &out ); diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp index 6bf24f8e55..d5ed53512a 100644 --- a/stepmania/src/NoteDataUtil.cpp +++ b/stepmania/src/NoteDataUtil.cpp @@ -392,7 +392,7 @@ void NoteDataUtil::RemoveHoldNotes(NoteData &in, float fStartBeat, float fEndBea int iStartIndex = BeatToNoteRow( fStartBeat ); int iEndIndex = BeatToNoteRow( fEndBeat ); - // turn all the HoldNotes into TapSteps + // turn all the HoldNotes into TapNotes for( int i=in.GetNumHoldNotes()-1; i>=0; i-- ) // iterate backwards so we can delete { const HoldNote hn = in.GetHoldNote( i ); @@ -410,7 +410,7 @@ void NoteDataUtil::RemoveSimultaneousNotes(NoteData &in, int iMaxSimultaneous, f int iStartIndex = BeatToNoteRow( fStartBeat ); int iEndIndex = BeatToNoteRow( fEndBeat ); - // turn all the HoldNotes into TapSteps + // turn all the HoldNotes into TapNotes for( int r=iStartIndex; r<=iEndIndex; r++ ) // iterate backwards so we can delete { if( in.IsRowEmpty(r) ) @@ -629,7 +629,7 @@ static void SuperShuffleTaps( NoteData &in, int iStartIndex, int iEndIndex ) { /* We already did the normal shuffling code above, which did a good job * of shuffling HoldNotes without creating impossible patterns. - * Now, go in and shuffle the TapSteps per-row. + * Now, go in and shuffle the TapNotes per-row. * * This is only called by NoteDataUtil::Turn. "in" is in 4s, and iStartIndex * and iEndIndex are in range. */ @@ -1192,7 +1192,7 @@ void NoteDataUtil::SnapToNearestNoteType( NoteData &in, NoteType nt1, NoteType n in.ConvertHoldNotesTo2sAnd3s(); - // iterate over all TapSteps in the interval and snap them + // iterate over all TapNotes in the interval and snap them for( int i=iNoteIndexBegin; i<=iNoteIndexEnd; i++ ) { int iOldIndex = i; @@ -1218,7 +1218,7 @@ void NoteDataUtil::SnapToNearestNoteType( NoteData &in, NoteType nt1, NoteType n const TapNote oldnote = in.GetTapNote(c, iNewIndex); if( note == TAP_TAP && (oldnote == TAP_HOLD_HEAD || oldnote == TAP_HOLD_TAIL) ) - continue; // HoldNotes override TapSteps + continue; // HoldNotes override TapNotes /* If two hold note boundaries are getting snapped together, * merge them. */ diff --git a/stepmania/src/NoteDisplay.h b/stepmania/src/NoteDisplay.h index 2e516bb9b9..cc054d746a 100644 --- a/stepmania/src/NoteDisplay.h +++ b/stepmania/src/NoteDisplay.h @@ -4,7 +4,7 @@ ----------------------------------------------------------------------------- Class: NoteDisplay - Desc: Draws TapSteps and HoldNotes. + Desc: Draws TapNotes and HoldNotes. Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. Brian Bugh diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index 38dc69437d..48138bd49b 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -581,7 +581,7 @@ void NoteField::DrawPrimitives() // - // Draw all TapSteps in this column + // Draw all TapNotes in this column // CurDisplay = m_BeatToNoteDisplays.begin(); NextDisplay = CurDisplay; ++NextDisplay; diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index ab6d1cf9c2..d54a8041fb 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -1328,7 +1328,7 @@ void ScreenEdit::TransitionFromRecordToEdit() int iNoteIndexBegin = BeatToNoteRow( m_NoteFieldEdit.m_fBeginMarker ); int iNoteIndexEnd = BeatToNoteRow( m_NoteFieldEdit.m_fEndMarker ); - // delete old TapSteps in the range + // delete old TapNotes in the range m_NoteFieldEdit.ClearRange( iNoteIndexBegin, iNoteIndexEnd ); m_NoteFieldEdit.CopyRange( &m_NoteFieldRecord, iNoteIndexBegin, iNoteIndexEnd, iNoteIndexBegin );