merge NoteFieldPlus back down

2003-11-27 05:18:28 +00:00
parent eab0bb6caa
commit c691a3c2da
6 changed files with 20 additions and 93 deletions
@@ -22,6 +22,8 @@
 #include "NoteDataWithScoring.h"
 #include "NoteDisplay.h"
 #include "ArrowBackdrop.h"
+#include "GrayArrowRow.h"
+#include "GhostArrowRow.h"

 class Song;

@@ -45,6 +47,12 @@ public:
 	void CacheAllUsedNoteSkins();
 	void CacheNoteSkin( CString skin );

+	void Step( int iCol ) { m_GrayArrowRow.Step( iCol ); }
+	void UpdateBars( int iCol ) { m_GrayArrowRow.UpdateBars( iCol ); }
+	void DidTapNote( int iCol, TapNoteScore score, bool bBright ) { m_GhostArrowRow.DidTapNote( iCol, score, bBright ); }
+	void DidHoldNote( int iCol ) { m_GhostArrowRow.DidHoldNote( iCol ); }
+	void DidTapMine( int iCol, TapNoteScore score ) { m_GhostArrowRow.DidTapMine( iCol, score ); }
+

 protected:
 	void DrawBeatBar( const float fBeat );
@@ -79,6 +87,9 @@ protected:
 	void SearchForBeat( NDMap::iterator &cur, NDMap::iterator &next, float Beat );
 	NDMap m_BeatToNoteDisplays;

+	GrayArrowRow	m_GrayArrowRow;
+	GhostArrowRow	m_GhostArrowRow;
+
 	// used in MODE_EDIT
 	Sprite			m_sprBars;	// 4 frames: Measure, 4th, 8th, 16th
 	BitmapText		m_textMeasureNumber;