diff --git a/Engine/source/afx/afxEffectGroup.cpp b/Engine/source/afx/afxEffectGroup.cpp index 71c6a89b6..e7677d4a7 100644 --- a/Engine/source/afx/afxEffectGroup.cpp +++ b/Engine/source/afx/afxEffectGroup.cpp @@ -253,13 +253,13 @@ DefineEngineMethod(afxEffectGroupData, reset, void, (),, object->reloadReset(); } -DefineEngineMethod(afxEffectGroupData, addEffect, void, (afxEffectBaseData* effect),, +DefineEngineMethod(afxEffectGroupData, pushEffect, void, (afxEffectBaseData* effect),, "Adds an effect (wrapper or group) to an effect-group.\n\n" "@ingroup AFX") { if (!effect) { - Con::errorf("afxEffectGroupData::addEffect() -- missing afxEffectWrapperData."); + Con::errorf("afxEffectGroupData::pushEffect() -- missing afxEffectWrapperData."); return; } diff --git a/Engine/source/afx/afxEffectron.cpp b/Engine/source/afx/afxEffectron.cpp index cf60ede4b..1c68256c1 100644 --- a/Engine/source/afx/afxEffectron.cpp +++ b/Engine/source/afx/afxEffectron.cpp @@ -216,13 +216,13 @@ DefineEngineMethod(afxEffectronData, reset, void, (),, object->reloadReset(); } -DefineEngineMethod(afxEffectronData, addEffect, void, (afxEffectBaseData* effect),, +DefineEngineMethod(afxEffectronData, pushEffect, void, (afxEffectBaseData* effect),, "Adds an effect (wrapper or group) to an effectron's phase.\n\n" "@ingroup AFX") { if (!effect) { - Con::errorf("afxEffectronData::addEffect() -- missing afxEffectWrapperData."); + Con::errorf("afxEffectronData::pushEffect() -- missing afxEffectWrapperData."); return; } diff --git a/Engine/source/afx/afxMagicSpell.cpp b/Engine/source/afx/afxMagicSpell.cpp index e169d70d7..b45d7c131 100644 --- a/Engine/source/afx/afxMagicSpell.cpp +++ b/Engine/source/afx/afxMagicSpell.cpp @@ -460,7 +460,7 @@ DefineEngineMethod(afxMagicSpellData, reset, void, (),, object->reloadReset(); } -DefineEngineMethod(afxMagicSpellData, addCastingEffect, void, (afxEffectBaseData* effect),, +DefineEngineMethod(afxMagicSpellData, pushCastingEffect, void, (afxEffectBaseData* effect),, "Adds an effect (wrapper or group) to a spell's casting phase.\n\n" "@ingroup AFX") { @@ -475,7 +475,7 @@ DefineEngineMethod(afxMagicSpellData, addCastingEffect, void, (afxEffectBaseData object->mCasting_fx_list.push_back(effect); } -DefineEngineMethod(afxMagicSpellData, addLaunchEffect, void, (afxEffectBaseData* effect),, +DefineEngineMethod(afxMagicSpellData, pushLaunchEffect, void, (afxEffectBaseData* effect),, "Adds an effect (wrapper or group) to a spell's launch phase.\n\n" "@ingroup AFX") @@ -491,7 +491,7 @@ DefineEngineMethod(afxMagicSpellData, addLaunchEffect, void, (afxEffectBaseData* object->mLaunch_fx_list.push_back(effect); } -DefineEngineMethod(afxMagicSpellData, addDeliveryEffect, void, (afxEffectBaseData* effect),, +DefineEngineMethod(afxMagicSpellData, pushDeliveryEffect, void, (afxEffectBaseData* effect),, "Adds an effect (wrapper or group) to a spell's delivery phase.\n\n" "@ingroup AFX") @@ -507,7 +507,7 @@ DefineEngineMethod(afxMagicSpellData, addDeliveryEffect, void, (afxEffectBaseDat object->mDelivery_fx_list.push_back(effect); } -DefineEngineMethod(afxMagicSpellData, addImpactEffect, void, (afxEffectBaseData* effect),, +DefineEngineMethod(afxMagicSpellData, pushImpactEffect, void, (afxEffectBaseData* effect),, "Adds an effect (wrapper or group) to a spell's impact phase.\n\n" "@ingroup AFX") @@ -523,7 +523,7 @@ DefineEngineMethod(afxMagicSpellData, addImpactEffect, void, (afxEffectBaseData* object->mImpact_fx_list.push_back(effect); } -DefineEngineMethod(afxMagicSpellData, addLingerEffect, void, (afxEffectBaseData* effect),, +DefineEngineMethod(afxMagicSpellData, pushLingerEffect, void, (afxEffectBaseData* effect),, "Adds an effect (wrapper or group) to a spell's linger phase.\n\n" "@ingroup AFX") diff --git a/Engine/source/afx/afxSelectron.cpp b/Engine/source/afx/afxSelectron.cpp index 67cd32849..033940dc3 100644 --- a/Engine/source/afx/afxSelectron.cpp +++ b/Engine/source/afx/afxSelectron.cpp @@ -35,7 +35,7 @@ //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// // afxSelectronData::ewValidator // -// When an effect is added using "addEffect", this validator intercepts the value +// When an effect is added using "pushEffect", this validator intercepts the value // and adds it to the dynamic effects list. // void afxSelectronData::ewValidator::validateType(SimObject* object, void* typePtr) diff --git a/Engine/source/afx/ce/afxPhraseEffect.cpp b/Engine/source/afx/ce/afxPhraseEffect.cpp index b574afbed..eff1315ec 100644 --- a/Engine/source/afx/ce/afxPhraseEffect.cpp +++ b/Engine/source/afx/ce/afxPhraseEffect.cpp @@ -297,12 +297,12 @@ void afxPhraseEffectData::gather_cons_defs(Vector& defs) //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~// -DefineEngineMethod( afxPhraseEffectData, addEffect, void, ( afxEffectBaseData* effectData ),, +DefineEngineMethod( afxPhraseEffectData, pushEffect, void, ( afxEffectBaseData* effectData ),, "Add a child effect to a phrase effect datablock. Argument can be an afxEffectWrappperData or an afxEffectGroupData.\n" ) { if (!effectData) { - Con::errorf("afxPhraseEffectData::addEffect() -- failed to resolve effect datablock."); + Con::errorf("afxPhraseEffectData::pushEffect() -- failed to resolve effect datablock."); return; }