From c575a5cc1ac465c8885408b75a50de9bffe6e735 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 27 Nov 2003 04:25:52 +0000 Subject: [PATCH] rename functions that have the same name as data types (confusing) --- stepmania/src/GhostArrowRow.cpp | 6 +++--- stepmania/src/GhostArrowRow.h | 6 +++--- stepmania/src/NoteFieldPlus.cpp | 12 ++++++------ stepmania/src/NoteFieldPlus.h | 6 +++--- stepmania/src/Player.cpp | 12 ++++++------ 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/stepmania/src/GhostArrowRow.cpp b/stepmania/src/GhostArrowRow.cpp index 7209916898..664ee4e391 100644 --- a/stepmania/src/GhostArrowRow.cpp +++ b/stepmania/src/GhostArrowRow.cpp @@ -106,7 +106,7 @@ void GhostArrowRow::DrawPrimitives() } -void GhostArrowRow::TapNote( int iCol, TapNoteScore score, bool bBright ) +void GhostArrowRow::DidTapNote( int iCol, TapNoteScore score, bool bBright ) { ASSERT( iCol >= 0 && iCol < m_iNumCols ); if( bBright ) @@ -115,13 +115,13 @@ void GhostArrowRow::TapNote( int iCol, TapNoteScore score, bool bBright ) m_GhostDim[iCol].Step( score ); } -void GhostArrowRow::HoldNote( int iCol ) +void GhostArrowRow::DidHoldNote( int iCol ) { ASSERT( iCol >= 0 && iCol < m_iNumCols ); m_HoldGhost[iCol].Step(); } -void GhostArrowRow::TapMine( int iCol, TapNoteScore score ) +void GhostArrowRow::DidTapMine( int iCol, TapNoteScore score ) { m_GhostMine[iCol].Step( score ); } diff --git a/stepmania/src/GhostArrowRow.h b/stepmania/src/GhostArrowRow.h index ab75780736..858e171291 100644 --- a/stepmania/src/GhostArrowRow.h +++ b/stepmania/src/GhostArrowRow.h @@ -28,9 +28,9 @@ public: void Load( PlayerNumber pn, float fYReverseOffset ); - void TapNote( int iCol, TapNoteScore score, bool bBright ); - void TapMine( int iCol, TapNoteScore score ); - void HoldNote( int iCol ); + void DidTapNote( int iCol, TapNoteScore score, bool bBright ); + void DidTapMine( int iCol, TapNoteScore score ); + void DidHoldNote( int iCol ); protected: int m_iNumCols; diff --git a/stepmania/src/NoteFieldPlus.cpp b/stepmania/src/NoteFieldPlus.cpp index abd98ac282..8851152984 100644 --- a/stepmania/src/NoteFieldPlus.cpp +++ b/stepmania/src/NoteFieldPlus.cpp @@ -56,17 +56,17 @@ void NoteFieldPlus::UpdateBars( int iCol ) m_GrayArrowRow.UpdateBars( iCol ); } -void NoteFieldPlus::TapNote( int iCol, TapNoteScore score, bool bBright ) +void NoteFieldPlus::DidTapNote( int iCol, TapNoteScore score, bool bBright ) { - m_GhostArrowRow.TapNote( iCol, score, bBright ); + m_GhostArrowRow.DidTapNote( iCol, score, bBright ); } -void NoteFieldPlus::HoldNote( int iCol ) +void NoteFieldPlus::DidHoldNote( int iCol ) { - m_GhostArrowRow.HoldNote( iCol ); + m_GhostArrowRow.DidHoldNote( iCol ); } -void NoteFieldPlus::TapMine( int iCol, TapNoteScore score ) +void NoteFieldPlus::DidTapMine( int iCol, TapNoteScore score ) { - m_GhostArrowRow.TapMine( iCol, score ); + m_GhostArrowRow.DidTapMine( iCol, score ); } diff --git a/stepmania/src/NoteFieldPlus.h b/stepmania/src/NoteFieldPlus.h index d95d006541..e2a0f16f5b 100644 --- a/stepmania/src/NoteFieldPlus.h +++ b/stepmania/src/NoteFieldPlus.h @@ -28,9 +28,9 @@ public: virtual void DrawPrimitives(); void Step( int iCol ); - void TapNote( int iCol, TapNoteScore score, bool bBright ); - void TapMine( int iCol, TapNoteScore score ); - void HoldNote( int iCol ); + void DidTapNote( int iCol, TapNoteScore score, bool bBright ); + void DidTapMine( int iCol, TapNoteScore score ); + void DidHoldNote( int iCol ); void UpdateBars( int iCol ); protected: GrayArrowRow m_GrayArrowRow; diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 27c8081a0d..997e2c4606 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -323,7 +323,7 @@ void PlayerMinus::Update( float fDeltaTime ) // Increase life fLife = 1; - m_pNoteField->HoldNote( hn.iTrack ); // update the "electric ghost" effect + m_pNoteField->DidHoldNote( hn.iTrack ); // update the "electric ghost" effect } else { @@ -350,7 +350,7 @@ void PlayerMinus::Update( float fDeltaTime ) { fLife = 1; hns = HNS_OK; - m_pNoteField->TapNote( StyleI.col, TNS_PERFECT, true ); // bright ghost flash + m_pNoteField->DidTapNote( StyleI.col, TNS_PERFECT, true ); // bright ghost flash } if( hns != HNS_NONE ) @@ -641,7 +641,7 @@ void PlayerMinus::Step( int col, RageTimer tm ) { m_soundMine.Play(); score = TNS_MISS; - m_pNoteField->TapMine( col, score ); + m_pNoteField->DidTapMine( col, score ); if( m_pLifeMeter ) m_pLifeMeter->ChangeLifeMine(); @@ -742,7 +742,7 @@ void PlayerMinus::Step( int col, RageTimer tm ) { m_soundMine.Play(); score = TNS_MISS; - m_pNoteField->TapMine( col, score ); + m_pNoteField->DidTapMine( col, score ); if( m_pLifeMeter ) m_pLifeMeter->ChangeLifeMine(); if( m_pCombinedLifeMeter ) @@ -923,7 +923,7 @@ void PlayerMinus::OnRowCompletelyJudged( int iIndexThatWasSteppedOn ) // show the ghost arrow for this column if (GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_fBlind) - m_pNoteField->TapNote( c, TNS_MARVELOUS, false ); + m_pNoteField->DidTapNote( c, TNS_MARVELOUS, false ); else { switch( score ) @@ -933,7 +933,7 @@ void PlayerMinus::OnRowCompletelyJudged( int iIndexThatWasSteppedOn ) case TNS_MARVELOUS: { bool bBright = GAMESTATE->m_CurStageStats.iCurCombo[m_PlayerNumber]>(int)BRIGHT_GHOST_COMBO_THRESHOLD; - m_pNoteField->TapNote( c, score, bBright ); + m_pNoteField->DidTapNote( c, score, bBright ); } break; }