const fix

comment
This commit is contained in:
Glenn Maynard
2004-02-11 05:57:51 +00:00
parent 7c0b6bb84d
commit 77716561dd
2 changed files with 6 additions and 5 deletions
+3 -2
View File
@@ -523,7 +523,7 @@ void PlayerMinus::DrawHoldJudgments()
}
/* It's OK for this function to search a little more than was requested. */
int PlayerMinus::GetClosestNoteDirectional( int col, float fBeat, float fMaxBeatsDistance, int iDirection )
int PlayerMinus::GetClosestNoteDirectional( int col, float fBeat, float fMaxBeatsDistance, int iDirection ) const
{
// look for the closest matching step
const int iIndexStartLookingAt = BeatToNoteRow( fBeat );
@@ -547,7 +547,7 @@ int PlayerMinus::GetClosestNoteDirectional( int col, float fBeat, float fMaxBeat
return -1;
}
int PlayerMinus::GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind )
int PlayerMinus::GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind ) const
{
int Fwd = GetClosestNoteDirectional(col, fBeat, fMaxBeatsAhead, 1);
int Back = GetClosestNoteDirectional(col, fBeat, fMaxBeatsBehind, -1);
@@ -1231,6 +1231,7 @@ void PlayerMinus::FadeToFail()
m_pNoteField->FadeToFail();
}
/* XXX: Why's m_NoteField in a separate class, again? Is that still needed? */
void Player::Load( PlayerNumber player_no, const NoteData* pNoteData, LifeMeter* pLM, CombinedLifeMeter* pCombinedLM, ScoreDisplay* pScoreDisplay, ScoreDisplay* pSecondaryScoreDisplay, Inventory* pInventory, ScoreKeeper* pPrimaryScoreKeeper, ScoreKeeper* pSecondaryScoreKeeper )
{
PlayerMinus::Load( player_no, pNoteData, pLM, pCombinedLM, pScoreDisplay, pSecondaryScoreDisplay, pInventory, pPrimaryScoreKeeper, pSecondaryScoreKeeper, &m_NoteField );
+3 -3
View File
@@ -53,7 +53,7 @@ public:
void Step( int col, RageTimer tm );
void RandomiseNotes( int iNoteRow );
void FadeToFail();
int GetDancingCharacterState() { return m_iDCState; };
int GetDancingCharacterState() const { return m_iDCState; };
void SetCharacterState(int iDCState) { m_iDCState = iDCState; };
void ApplyWaitingTransforms();
@@ -66,8 +66,8 @@ protected:
void DrawTapJudgments();
void DrawHoldJudgments();
int GetClosestNoteDirectional( int col, float fBeat, float fMaxBeatsAhead, int iDirection );
int GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind );
int GetClosestNoteDirectional( int col, float fBeat, float fMaxBeatsAhead, int iDirection ) const;
int GetClosestNote( int col, float fBeat, float fMaxBeatsAhead, float fMaxBeatsBehind ) const;
static float GetMaxStepDistanceSeconds();