SetEffectNone -> StopEffect

This commit is contained in:
Chris Danford
2005-07-24 03:11:03 +00:00
parent 9cf25ad2b1
commit 1fffd48c57
12 changed files with 17 additions and 17 deletions
+2 -2
View File
@@ -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);
+1 -1
View File
@@ -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 )
+1 -1
View File
@@ -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 )
+1 -1
View File
@@ -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 );
}
+1 -1
View File
@@ -104,7 +104,7 @@ void MenuTimer::Update( float fDeltaTime )
Stop();
SCREENMAN->PostMessageToTopScreen( SM_MenuTimer, 0 );
for( int i=0; i<NUM_MENU_TIMER_TEXTS; i++ )
m_text[i].SetEffectNone();
m_text[i].StopEffect();
}
}
+1 -1
View File
@@ -695,7 +695,7 @@ void OptionRow::UpdateEnabledDisabled()
if( bThisRowHasFocusByAll )
m_textItems[0]->SetEffectDiffuseShift( 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 )
+1 -1
View File
@@ -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();
}
}
}
+1 -1
View File
@@ -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 );
+4 -4
View File
@@ -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();
}
}
}
+1 -1
View File
@@ -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;
}
}
+2 -2
View File
@@ -1308,12 +1308,12 @@ void ScreenSelectMusic::AfterStepsChange( const vector<PlayerNumber> &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 );
+1 -1
View File
@@ -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) );