From 9a2f78843d4ddbbb21ba9cc5b2d2b17156fcc25a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 27 Nov 2003 05:23:33 +0000 Subject: [PATCH] merge NoteFieldPlus down --- stepmania/src/Player.cpp | 2 +- stepmania/src/Player.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 997e2c4606..5752a70693 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -100,7 +100,7 @@ PlayerMinus::~PlayerMinus() { } -void PlayerMinus::Load( PlayerNumber pn, const NoteData* pNoteData, LifeMeter* pLM, CombinedLifeMeter* pCombinedLM, ScoreDisplay* pScoreDisplay, ScoreDisplay* pSecondaryScoreDisplay, Inventory* pInventory, ScoreKeeper* pPrimaryScoreKeeper, ScoreKeeper* pSecondaryScoreKeeper, NoteFieldPlus* pNoteField ) +void PlayerMinus::Load( PlayerNumber pn, const NoteData* pNoteData, LifeMeter* pLM, CombinedLifeMeter* pCombinedLM, ScoreDisplay* pScoreDisplay, ScoreDisplay* pSecondaryScoreDisplay, Inventory* pInventory, ScoreKeeper* pPrimaryScoreKeeper, ScoreKeeper* pSecondaryScoreKeeper, NoteField* pNoteField ) { m_iDCState = AS2D_IDLE; //LOG->Trace( "PlayerMinus::Load()", ); diff --git a/stepmania/src/Player.h b/stepmania/src/Player.h index 4fcf980438..04ffc671be 100644 --- a/stepmania/src/Player.h +++ b/stepmania/src/Player.h @@ -21,7 +21,6 @@ #include "Judgment.h" #include "HoldJudgment.h" #include "Combo.h" -#include "NoteFieldPlus.h" #include "NoteDataWithScoring.h" #include "ArrowBackdrop.h" #include "RageTimer.h" @@ -29,6 +28,7 @@ #include "RageSound.h" #include "DancingCharacters.h" #include "AttackDisplay.h" +#include "NoteField.h" class ScoreDisplay; class LifeMeter; @@ -48,7 +48,7 @@ public: virtual void Update( float fDeltaTime ); virtual void DrawPrimitives(); - void Load( PlayerNumber player_no, const NoteData* pNoteData, LifeMeter* pLM, CombinedLifeMeter* pCombinedLM, ScoreDisplay* pScoreDisplay, ScoreDisplay* pSecondaryScoreDisplay, Inventory* pInventory, ScoreKeeper* pPrimaryScoreKeeper, ScoreKeeper* pSecondaryScoreKeeper, NoteFieldPlus* pNoteField ); + void Load( PlayerNumber player_no, const NoteData* pNoteData, LifeMeter* pLM, CombinedLifeMeter* pCombinedLM, ScoreDisplay* pScoreDisplay, ScoreDisplay* pSecondaryScoreDisplay, Inventory* pInventory, ScoreKeeper* pPrimaryScoreKeeper, ScoreKeeper* pSecondaryScoreKeeper, NoteField* pNoteField ); void CrossedRow( int iNoteRow ); void Step( int col, RageTimer tm ); void RandomiseNotes( int iNoteRow ); @@ -75,7 +75,7 @@ protected: int m_iOffsetSample; // ArrowBackdrop m_ArrowBackdrop; - NoteFieldPlus* m_pNoteField; + NoteField* m_pNoteField; HoldJudgment m_HoldJudgment[MAX_NOTE_TRACKS]; @@ -109,7 +109,7 @@ public: void Load( PlayerNumber player_no, const NoteData* pNoteData, LifeMeter* pLM, CombinedLifeMeter* pCombinedLM, ScoreDisplay* pScoreDisplay, ScoreDisplay* pSecondaryScoreDisplay, Inventory* pInventory, ScoreKeeper* pPrimaryScoreKeeper, ScoreKeeper* pSecondaryScoreKeeper ); protected: - NoteFieldPlus m_NoteField; + NoteField m_NoteField; };