From 75267d2a26d6bf309d35ac1c0d5cc63c6e5f4072 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 2 Nov 2002 23:14:52 +0000 Subject: [PATCH] Make m_HoldNotes private. Remove the copy ctor; no longer needed. (Looking back, I don't think it was needed anyway.) --- stepmania/src/NoteData.cpp | 12 ------------ stepmania/src/NoteData.h | 5 ++--- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp index 5c9b19c470..225e24f0ee 100644 --- a/stepmania/src/NoteData.cpp +++ b/stepmania/src/NoteData.cpp @@ -33,18 +33,6 @@ NoteData::NoteData(const NoteData &cpy) *this = cpy; } -NoteData &NoteData::operator= (const NoteData &cpy) -{ - Init(); - - for(int t = 0; t < MAX_NOTE_TRACKS; ++t) - m_TapNotes[t] = cpy.m_TapNotes[t]; - - m_iNumTracks = cpy.m_iNumTracks; - m_HoldNotes = cpy.m_HoldNotes; - return *this; -} - void NoteData::Init() { m_iNumTracks = 0; diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h index fbd532f173..f61d88e8de 100644 --- a/stepmania/src/NoteData.h +++ b/stepmania/src/NoteData.h @@ -27,17 +27,16 @@ class NoteData /* Keep this aligned, so that they all have the same size. */ vector m_TapNotes[MAX_NOTE_TRACKS]; + vector m_HoldNotes; + public: NoteData(); ~NoteData(); NoteData(const NoteData &cpy); void Init(); - NoteData &operator=(const NoteData &cpy); int m_iNumTracks; - vector m_HoldNotes; - /* Return the note at the given track and row. Row may be out of * range; pretend the song goes on with TAP_EMPTYs indefinitely. */ inline TapNote GetTapNote(unsigned track, unsigned row) const