From dbb06ce6ac870d4de3c8abb2d88eec648a0751e8 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 25 Oct 2002 04:37:00 +0000
Subject: [PATCH] use Get/SetTapNote

---
 stepmania/src/NoteDataWithScoring.cpp |  4 +--
 stepmania/src/NoteDataWithScoring.h   |  2 +-
 stepmania/src/NotesLoaderBMS.cpp      |  2 +-
 stepmania/src/NotesWriterDWI.cpp      | 40 +++++++++++++--------------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp
index 087e00fc5c..5a67f842fa 100644
--- a/stepmania/src/NoteDataWithScoring.cpp
+++ b/stepmania/src/NoteDataWithScoring.cpp
@@ -49,7 +49,7 @@ int NoteDataWithScoring::GetNumTapNotesWithScore( TapNoteScore tns, const float
 	{
 		for( int t=0; t<m_iNumTracks; t++ )
 		{
-			if( m_TapNotes[t][i] != '0'  &&  m_TapNoteScores[t][i] == tns )
+			if( this->GetTapNote(t, i) != TAP_EMPTY && m_TapNoteScores[t][i] == tns )
 				iNumSuccessfulTapNotes++;
 		}
 	}
@@ -70,7 +70,7 @@ int NoteDataWithScoring::GetNumDoublesWithScore( TapNoteScore tns, const float f
 		TapNoteScore	minTapNoteScore = TNS_PERFECT;
 		for( int t=0; t<m_iNumTracks; t++ )
 		{
-			if( m_TapNotes[t][i] != '0' )
+			if( GetTapNote(t, i) != TAP_EMPTY )
 			{
 				iNumNotesThisIndex++;
 				minTapNoteScore = min( minTapNoteScore, m_TapNoteScores[t][i] );
diff --git a/stepmania/src/NoteDataWithScoring.h b/stepmania/src/NoteDataWithScoring.h
index c19d41ea49..174ea0a38e 100644
--- a/stepmania/src/NoteDataWithScoring.h
+++ b/stepmania/src/NoteDataWithScoring.h
@@ -38,7 +38,7 @@ struct NoteDataWithScoring : public NoteData
 	inline bool IsRowComplete( int index )
 	{
 		for( int t=0; t<m_iNumTracks; t++ )
-			if( m_TapNotes[t][index] != '0'  &&  m_TapNoteScores[t][index] < TNS_GREAT )
+			if( GetTapNote(t, index) != TAP_EMPTY && m_TapNoteScores[t][index] < TNS_GREAT )
 				return false;
 		return true;
 	}
diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp
index e97fee89f8..de4e4e2d88 100644
--- a/stepmania/src/NotesLoaderBMS.cpp
+++ b/stepmania/src/NotesLoaderBMS.cpp
@@ -177,7 +177,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Notes &out )
 					mapBMSTrackToDanceNote( iTrackNum, iColumnNumber, cNoteChar );
 
 					if( iColumnNumber != -1 )
-						pNoteData->m_TapNotes[iColumnNumber][iNoteIndex] = cNoteChar;
+						pNoteData->SetTapNote(iColumnNumber, iNoteIndex, cNoteChar);
 				}
 			}
 		}
diff --git a/stepmania/src/NotesWriterDWI.cpp b/stepmania/src/NotesWriterDWI.cpp
index 3eb1aa80d8..a8c8906420 100644
--- a/stepmania/src/NotesWriterDWI.cpp
+++ b/stepmania/src/NotesWriterDWI.cpp
@@ -123,33 +123,33 @@ void NotesWriterDWI::WriteDWINotesField( FILE* fp, const Notes &out, int start )
 			case NOTES_TYPE_DANCE_COUPLE:
 			case NOTES_TYPE_DANCE_DOUBLE:
 				fprintf( fp, NotesToDWIString( 
-					notedata.m_TapNotes[start+0][row], 
-					notedata.m_TapNotes[start+1][row],
-					notedata.m_TapNotes[start+2][row],
-					notedata.m_TapNotes[start+3][row] ) );
+					notedata.GetTapNote(start+0, row), 
+					notedata.GetTapNote(start+1, row),
+					notedata.GetTapNote(start+2, row),
+					notedata.GetTapNote(start+3, row) ) );
 
 				// Blank out the notes so we don't write them again if the incrementer is small
-				notedata.m_TapNotes[start+0][row] = '0';
-				notedata.m_TapNotes[start+1][row] = '0';
-				notedata.m_TapNotes[start+2][row] = '0';
-				notedata.m_TapNotes[start+3][row] = '0';
+				notedata.SetTapNote(start+0, row, TAP_EMPTY);
+				notedata.SetTapNote(start+1, row, TAP_EMPTY);
+				notedata.SetTapNote(start+2, row, TAP_EMPTY);
+				notedata.SetTapNote(start+3, row, TAP_EMPTY);
 				break;
 			case NOTES_TYPE_DANCE_SOLO:
 				fprintf( fp, NotesToDWIString( 
-					notedata.m_TapNotes[0][row], 
-					notedata.m_TapNotes[1][row],
-					notedata.m_TapNotes[2][row],
-					notedata.m_TapNotes[3][row],
-					notedata.m_TapNotes[4][row],
-					notedata.m_TapNotes[5][row] ) );
+					notedata.GetTapNote(0, row),
+					notedata.GetTapNote(1, row),
+					notedata.GetTapNote(2, row),
+					notedata.GetTapNote(3, row),
+					notedata.GetTapNote(4, row),
+					notedata.GetTapNote(5, row) ) );
 
 				// Blank out the notes so we don't write them again if the incrementer is small
-				notedata.m_TapNotes[start+0][row] = '0';
-				notedata.m_TapNotes[start+1][row] = '0';
-				notedata.m_TapNotes[start+2][row] = '0';
-				notedata.m_TapNotes[start+3][row] = '0';
-				notedata.m_TapNotes[start+4][row] = '0';
-				notedata.m_TapNotes[start+5][row] = '0';
+				notedata.SetTapNote(start+0, row, TAP_EMPTY);
+				notedata.SetTapNote(start+1, row, TAP_EMPTY);
+				notedata.SetTapNote(start+2, row, TAP_EMPTY);
+				notedata.SetTapNote(start+3, row, TAP_EMPTY);
+				notedata.SetTapNote(start+4, row, TAP_EMPTY);
+				notedata.SetTapNote(start+5, row, TAP_EMPTY);
 				break;
 			default:
 				ASSERT(0);	// not a type supported by DWI.  We shouldn't have called in here if that's the case