From 725fc9824876cd08f7df6c648d1acfc3d2887a7f Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 25 Oct 2002 04:59:26 +0000 Subject: [PATCH] use Get/SetTapNote --- stepmania/src/NotesLoaderDWI.cpp | 8 ++++---- stepmania/src/NotesLoaderKSF.cpp | 4 +++- stepmania/src/ScreenEdit.cpp | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp index a6e45c7fdb..f6e3868bf5 100644 --- a/stepmania/src/NotesLoaderDWI.cpp +++ b/stepmania/src/NotesLoaderDWI.cpp @@ -195,12 +195,12 @@ bool DWILoader::LoadFromDWITokens( if( note1 != DANCE_NOTE_NONE ) { int iCol1 = mapDanceNoteToNoteDataColumn[note1]; - pNoteData->m_TapNotes[iCol1][iIndex] = '2'; + pNoteData->SetTapNote(iCol1, iIndex, TAP_HOLD_HEAD); } if( note2 != DANCE_NOTE_NONE ) { int iCol2 = mapDanceNoteToNoteDataColumn[note2]; - pNoteData->m_TapNotes[iCol2][iIndex] = '2'; + pNoteData->SetTapNote(iCol2, iIndex, TAP_HOLD_HEAD); } } break; @@ -214,12 +214,12 @@ bool DWILoader::LoadFromDWITokens( if( note1 != DANCE_NOTE_NONE ) { int iCol1 = mapDanceNoteToNoteDataColumn[note1]; - pNoteData->m_TapNotes[iCol1][iIndex] = '1'; + pNoteData->SetTapNote(iCol1, iIndex, TAP_TAP); } if( note2 != DANCE_NOTE_NONE ) { int iCol2 = mapDanceNoteToNoteDataColumn[note2]; - pNoteData->m_TapNotes[iCol2][iIndex] = '1'; + pNoteData->SetTapNote(iCol2, iIndex, TAP_TAP); } fCurrentBeat += fCurrentIncrementer; diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp index ecf083d2f5..88ea57716c 100644 --- a/stepmania/src/NotesLoaderKSF.cpp +++ b/stepmania/src/NotesLoaderKSF.cpp @@ -90,7 +90,9 @@ bool KSFLoader::LoadFromKSFFile( const CString &sPath, Notes &out ) iHoldStartRow[t] = -1; } - notedata.m_TapNotes[t][row] = sRowString[t]; + /* XXXXX: don't do this, translate explicitly, so the TAP_* constants + * can be changed */ + notedata.SetTapNote(t, row, sRowString[t]); } } diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 21d2b8bfb4..0537698cac 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -1213,7 +1213,7 @@ void ScreenEdit::InputRecord( const DeviceInput& DeviceI, const InputEventType t if( iRow < 0 ) break; - m_NoteFieldRecord.m_TapNotes[iCol][iRow] = '1'; + m_NoteFieldRecord.SetTapNote(iCol, iRow, TAP_TAP); m_GrayArrowRowRecord.Step( iCol ); } break;