actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename functions that have the same name as data types (confusing)

Browse Source
This commit is contained in:
Glenn Maynard
2003-11-27 04:25:52 +00:00
parent d12ba972ff
commit c575a5cc1a
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GhostArrowRow.cpp
+3 -3
View File
@@ -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 ); ASSERT( iCol >= 0 && iCol < m_iNumCols );
if( bBright ) if( bBright )
@@ -115,13 +115,13 @@ void GhostArrowRow::TapNote( int iCol, TapNoteScore score, bool bBright )
m_GhostDim[iCol].Step( score ); m_GhostDim[iCol].Step( score );
} }
void GhostArrowRow::HoldNote( int iCol ) void GhostArrowRow::DidHoldNote( int iCol )
{ {
ASSERT( iCol >= 0 && iCol < m_iNumCols ); ASSERT( iCol >= 0 && iCol < m_iNumCols );
m_HoldGhost[iCol].Step(); m_HoldGhost[iCol].Step();
} }
void GhostArrowRow::TapMine( int iCol, TapNoteScore score ) void GhostArrowRow::DidTapMine( int iCol, TapNoteScore score )
{ {
m_GhostMine[iCol].Step( score ); m_GhostMine[iCol].Step( score );
} }
stepmania/src/GhostArrowRow.h
+3 -3
View File
@@ -28,9 +28,9 @@ public:
void Load( PlayerNumber pn, float fYReverseOffset ); void Load( PlayerNumber pn, float fYReverseOffset );
void TapNote( int iCol, TapNoteScore score, bool bBright ); void DidTapNote( int iCol, TapNoteScore score, bool bBright );
void TapMine( int iCol, TapNoteScore score ); void DidTapMine( int iCol, TapNoteScore score );
void HoldNote( int iCol ); void DidHoldNote( int iCol );
protected: protected:
int m_iNumCols; int m_iNumCols;
stepmania/src/NoteFieldPlus.cpp
+6 -6
View File
@@ -56,17 +56,17 @@ void NoteFieldPlus::UpdateBars( int iCol )
m_GrayArrowRow.UpdateBars( 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 );
} }
stepmania/src/NoteFieldPlus.h
+3 -3
View File
@@ -28,9 +28,9 @@ public:
virtual void DrawPrimitives(); virtual void DrawPrimitives();
void Step( int iCol ); void Step( int iCol );
void TapNote( int iCol, TapNoteScore score, bool bBright ); void DidTapNote( int iCol, TapNoteScore score, bool bBright );
void TapMine( int iCol, TapNoteScore score ); void DidTapMine( int iCol, TapNoteScore score );
void HoldNote( int iCol ); void DidHoldNote( int iCol );
void UpdateBars( int iCol ); void UpdateBars( int iCol );
protected: protected:
GrayArrowRow m_GrayArrowRow; GrayArrowRow m_GrayArrowRow;
stepmania/src/Player.cpp
+6 -6
View File
@@ -323,7 +323,7 @@ void PlayerMinus::Update( float fDeltaTime )
// Increase life // Increase life
fLife = 1; fLife = 1;
m_pNoteField->HoldNote( hn.iTrack ); // update the "electric ghost" effect m_pNoteField->DidHoldNote( hn.iTrack ); // update the "electric ghost" effect
} }
else else
{ {
@@ -350,7 +350,7 @@ void PlayerMinus::Update( float fDeltaTime )
{ {
fLife = 1; fLife = 1;
hns = HNS_OK; 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 ) if( hns != HNS_NONE )
@@ -641,7 +641,7 @@ void PlayerMinus::Step( int col, RageTimer tm )
{ {
m_soundMine.Play(); m_soundMine.Play();
score = TNS_MISS; score = TNS_MISS;
m_pNoteField->TapMine( col, score ); m_pNoteField->DidTapMine( col, score );
if( m_pLifeMeter ) if( m_pLifeMeter )
m_pLifeMeter->ChangeLifeMine(); m_pLifeMeter->ChangeLifeMine();
@@ -742,7 +742,7 @@ void PlayerMinus::Step( int col, RageTimer tm )
{ {
m_soundMine.Play(); m_soundMine.Play();
score = TNS_MISS; score = TNS_MISS;
m_pNoteField->TapMine( col, score ); m_pNoteField->DidTapMine( col, score );
if( m_pLifeMeter ) if( m_pLifeMeter )
m_pLifeMeter->ChangeLifeMine(); m_pLifeMeter->ChangeLifeMine();
if( m_pCombinedLifeMeter ) if( m_pCombinedLifeMeter )
@@ -923,7 +923,7 @@ void PlayerMinus::OnRowCompletelyJudged( int iIndexThatWasSteppedOn )
// show the ghost arrow for this column // show the ghost arrow for this column
if (GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_fBlind) if (GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_fBlind)
m_pNoteField->TapNote( c, TNS_MARVELOUS, false ); m_pNoteField->DidTapNote( c, TNS_MARVELOUS, false );
else else
{ {
switch( score ) switch( score )
@@ -933,7 +933,7 @@ void PlayerMinus::OnRowCompletelyJudged( int iIndexThatWasSteppedOn )
case TNS_MARVELOUS: case TNS_MARVELOUS:
{ {
bool bBright = GAMESTATE->m_CurStageStats.iCurCombo[m_PlayerNumber]>(int)BRIGHT_GHOST_COMBO_THRESHOLD; 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; break;
} }