From 1fffd48c573b522f7db232fe05345f349d397377 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 24 Jul 2005 03:11:03 +0000 Subject: [PATCH] SetEffectNone -> StopEffect --- stepmania/src/BeginnerHelper.cpp | 4 ++-- stepmania/src/DifficultyMeter.cpp | 2 +- stepmania/src/HoldJudgment.cpp | 2 +- stepmania/src/Judgment.cpp | 2 +- stepmania/src/MenuTimer.cpp | 2 +- stepmania/src/OptionRow.cpp | 2 +- stepmania/src/ScreenMapControllers.cpp | 2 +- stepmania/src/ScreenPrompt.cpp | 2 +- stepmania/src/ScreenRanking.cpp | 8 ++++---- stepmania/src/ScreenSelectCharacter.cpp | 2 +- stepmania/src/ScreenSelectMusic.cpp | 4 ++-- stepmania/src/ScreenSetTime.cpp | 2 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/stepmania/src/BeginnerHelper.cpp b/stepmania/src/BeginnerHelper.cpp index 146311e296..664295d56c 100644 --- a/stepmania/src/BeginnerHelper.cpp +++ b/stepmania/src/BeginnerHelper.cpp @@ -85,7 +85,7 @@ void BeginnerHelper::ShowStepCircle( PlayerNumber pn, int CSTEP ) case ST_DOWN: isc=3; break; } - m_sStepCircle[pn][isc].SetEffectNone(); + m_sStepCircle[pn][isc].StopEffect(); m_sStepCircle[pn][isc].SetZoom(2); m_sStepCircle[pn][isc].StopTweening(); m_sStepCircle[pn][isc].BeginTweening((GAMESTATE->m_fCurBPS/3), TWEEN_LINEAR); @@ -312,7 +312,7 @@ void BeginnerHelper::Step( PlayerNumber pn, int CSTEP ) break; } - m_sFlash.SetEffectNone(); + m_sFlash.StopEffect(); m_sFlash.StopTweening(); m_sFlash.Sleep(GAMESTATE->m_fCurBPS /16); m_sFlash.SetDiffuseAlpha(1); diff --git a/stepmania/src/DifficultyMeter.cpp b/stepmania/src/DifficultyMeter.cpp index a69e84adcf..19dbf9cd58 100644 --- a/stepmania/src/DifficultyMeter.cpp +++ b/stepmania/src/DifficultyMeter.cpp @@ -211,7 +211,7 @@ void DifficultyMeter::SetInternal( int iMeter, Difficulty dc, const CString &sDi if( iMeter > m_iGlowIfMeterGreaterThan ) m_textFeet.SetEffectGlowShift(); else - m_textFeet.SetEffectNone(); + m_textFeet.StopEffect(); } if( m_bShowMeter ) diff --git a/stepmania/src/HoldJudgment.cpp b/stepmania/src/HoldJudgment.cpp index 94d511fd2a..02e665aa3a 100644 --- a/stepmania/src/HoldJudgment.cpp +++ b/stepmania/src/HoldJudgment.cpp @@ -22,7 +22,7 @@ void HoldJudgment::Reset() m_sprJudgment.SetDiffuse( RageColor(1,1,1,0) ); m_sprJudgment.SetXY( 0, 0 ); m_sprJudgment.StopTweening(); - m_sprJudgment.SetEffectNone(); + m_sprJudgment.StopEffect(); } void HoldJudgment::SetHoldJudgment( HoldNoteScore hns ) diff --git a/stepmania/src/Judgment.cpp b/stepmania/src/Judgment.cpp index f147881ea1..3bbffe7afc 100644 --- a/stepmania/src/Judgment.cpp +++ b/stepmania/src/Judgment.cpp @@ -31,7 +31,7 @@ void Judgment::Reset() { m_sprJudgment.FinishTweening(); m_sprJudgment.SetXY( 0, 0 ); - m_sprJudgment.SetEffectNone(); + m_sprJudgment.StopEffect(); m_sprJudgment.SetHidden( true ); } diff --git a/stepmania/src/MenuTimer.cpp b/stepmania/src/MenuTimer.cpp index c223f2cf00..dc3d75c662 100644 --- a/stepmania/src/MenuTimer.cpp +++ b/stepmania/src/MenuTimer.cpp @@ -104,7 +104,7 @@ void MenuTimer::Update( float fDeltaTime ) Stop(); SCREENMAN->PostMessageToTopScreen( SM_MenuTimer, 0 ); for( int i=0; iSetEffectDiffuseShift( 1.0f, m_pParentType->COLOR_SELECTED, m_pParentType->COLOR_NOT_SELECTED ); else - m_textItems[0]->SetEffectNone(); + m_textItems[0]->StopEffect(); } if( m_sprBullet->DestTweenState().diffuse[0] != color ) diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp index e61dc0150b..afecd60c93 100644 --- a/stepmania/src/ScreenMapControllers.cpp +++ b/stepmania/src/ScreenMapControllers.cpp @@ -364,7 +364,7 @@ void ScreenMapControllers::Refresh() if( bPulse ) m_textMappedTo[p][b][s].SetEffectPulse( .5f, .5f, .6f ); else - m_textMappedTo[p][b][s].SetEffectNone(); + m_textMappedTo[p][b][s].StopEffect(); } } } diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp index 78c1959b7b..3dfef58d59 100644 --- a/stepmania/src/ScreenPrompt.cpp +++ b/stepmania/src/ScreenPrompt.cpp @@ -115,7 +115,7 @@ void ScreenPrompt::Input( const DeviceInput& DeviceI, const InputEventType type, void ScreenPrompt::Change( int dir ) { - m_textAnswer[m_Answer].SetEffectNone(); + m_textAnswer[m_Answer].StopEffect(); m_Answer = (PromptAnswer)(m_Answer+dir); ASSERT( m_Answer >= 0 && m_Answer < NUM_PROMPT_ANSWERS ); diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp index ac852d1bb8..40ef986ca3 100644 --- a/stepmania/src/ScreenRanking.cpp +++ b/stepmania/src/ScreenRanking.cpp @@ -780,8 +780,8 @@ float ScreenRanking::SetPage( PageToShow pts ) } else { - m_textNames[l].SetEffectNone(); - m_textScores[l].SetEffectNone(); + m_textNames[l].StopEffect(); + m_textScores[l].StopEffect(); } } } @@ -831,8 +831,8 @@ float ScreenRanking::SetPage( PageToShow pts ) } else { - m_textNames[l].SetEffectNone(); - m_textScores[l].SetEffectNone(); + m_textNames[l].StopEffect(); + m_textScores[l].StopEffect(); } } } diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp index aae919ebbc..6b9ebb88cc 100644 --- a/stepmania/src/ScreenSelectCharacter.cpp +++ b/stepmania/src/ScreenSelectCharacter.cpp @@ -214,7 +214,7 @@ void ScreenSelectCharacter::BeforeRowChange( PlayerNumber pn ) { case CHOOSING_CPU_CHARACTER: case CHOOSING_HUMAN_CHARACTER: - m_sprCardArrows[pnAffected].SetEffectNone(); + m_sprCardArrows[pnAffected].StopEffect(); break; } } diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp index 061b174cd8..fcaf093216 100644 --- a/stepmania/src/ScreenSelectMusic.cpp +++ b/stepmania/src/ScreenSelectMusic.cpp @@ -1308,12 +1308,12 @@ void ScreenSelectMusic::AfterStepsChange( const vector &vpns ) m_DifficultyIcon[pn].SetFromSteps( pn, pSteps ); if( pSteps && pSteps->IsAutogen() ) { - m_AutoGenIcon[pn].SetEffectNone(); + m_AutoGenIcon[pn].StopEffect(); m_AutoGenIcon[pn].SetDiffuse( RageColor(1,1,1,1) ); } else { - m_AutoGenIcon[pn].SetEffectNone(); + m_AutoGenIcon[pn].StopEffect(); m_AutoGenIcon[pn].SetDiffuse( RageColor(1,1,1,0) ); } m_DifficultyMeter[pn].SetFromGameState( pn ); diff --git a/stepmania/src/ScreenSetTime.cpp b/stepmania/src/ScreenSetTime.cpp index dfc8bb4b77..1776520a2f 100644 --- a/stepmania/src/ScreenSetTime.cpp +++ b/stepmania/src/ScreenSetTime.cpp @@ -157,7 +157,7 @@ void ScreenSetTime::ChangeSelection( int iDirection ) if( iDirection != 0 && m_Selection == OldSelection ) return; // can't move any more - m_textValue[OldSelection].SetEffectNone(); + m_textValue[OldSelection].StopEffect(); m_textValue[m_Selection].SetEffectDiffuseShift( 1.f, RageColor(0.3f,0.3f,0.3f,1), RageColor(1,1,1,1) );