TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove name-clashes in AFX code-base

Browse source
This commit is contained in:
Lukas Aldershaab 2020-10-04 03:18:54 +02:00
parent f4c8e2683e
commit 158bf5528c
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/afx/afxEffectGroup.cpp
View file

@ -253,13 +253,13 @@ DefineEngineMethod(afxEffectGroupData, reset, void, (),,
object->reloadReset(); 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" "Adds an effect (wrapper or group) to an effect-group.\n\n"
"@ingroup AFX") "@ingroup AFX")
{ {
if (!effect) if (!effect)
{ {
Con::errorf("afxEffectGroupData::addEffect() -- missing afxEffectWrapperData."); Con::errorf("afxEffectGroupData::pushEffect() -- missing afxEffectWrapperData.");
return; return;
} }

4
Engine/source/afx/afxEffectron.cpp
View file

@ -216,13 +216,13 @@ DefineEngineMethod(afxEffectronData, reset, void, (),,
object->reloadReset(); 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" "Adds an effect (wrapper or group) to an effectron's phase.\n\n"
"@ingroup AFX") "@ingroup AFX")
{ {
if (!effect) if (!effect)
{ {
Con::errorf("afxEffectronData::addEffect() -- missing afxEffectWrapperData."); Con::errorf("afxEffectronData::pushEffect() -- missing afxEffectWrapperData.");
return; return;
} }

10
Engine/source/afx/afxMagicSpell.cpp
View file

@ -460,7 +460,7 @@ DefineEngineMethod(afxMagicSpellData, reset, void, (),,
object->reloadReset(); 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" "Adds an effect (wrapper or group) to a spell's casting phase.\n\n"
"@ingroup AFX") "@ingroup AFX")
{ {
@ -475,7 +475,7 @@ DefineEngineMethod(afxMagicSpellData, addCastingEffect, void, (afxEffectBaseData
object->mCasting_fx_list.push_back(effect); 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" "Adds an effect (wrapper or group) to a spell's launch phase.\n\n"
"@ingroup AFX") "@ingroup AFX")
@ -491,7 +491,7 @@ DefineEngineMethod(afxMagicSpellData, addLaunchEffect, void, (afxEffectBaseData*
object->mLaunch_fx_list.push_back(effect); 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" "Adds an effect (wrapper or group) to a spell's delivery phase.\n\n"
"@ingroup AFX") "@ingroup AFX")
@ -507,7 +507,7 @@ DefineEngineMethod(afxMagicSpellData, addDeliveryEffect, void, (afxEffectBaseDat
object->mDelivery_fx_list.push_back(effect); 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" "Adds an effect (wrapper or group) to a spell's impact phase.\n\n"
"@ingroup AFX") "@ingroup AFX")
@ -523,7 +523,7 @@ DefineEngineMethod(afxMagicSpellData, addImpactEffect, void, (afxEffectBaseData*
object->mImpact_fx_list.push_back(effect); 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" "Adds an effect (wrapper or group) to a spell's linger phase.\n\n"
"@ingroup AFX") "@ingroup AFX")

2
Engine/source/afx/afxSelectron.cpp
View file

@ -35,7 +35,7 @@
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
// afxSelectronData::ewValidator // 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. // and adds it to the dynamic effects list.
// //
void afxSelectronData::ewValidator::validateType(SimObject* object, void* typePtr) void afxSelectronData::ewValidator::validateType(SimObject* object, void* typePtr)

4
Engine/source/afx/ce/afxPhraseEffect.cpp
View file

@ -297,12 +297,12 @@ void afxPhraseEffectData::gather_cons_defs(Vector<afxConstraintDef>& 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" ) "Add a child effect to a phrase effect datablock. Argument can be an afxEffectWrappperData or an afxEffectGroupData.\n" )
{ {
if (!effectData) if (!effectData)
{ {
Con::errorf("afxPhraseEffectData::addEffect() -- failed to resolve effect datablock."); Con::errorf("afxPhraseEffectData::pushEffect() -- failed to resolve effect datablock.");
return; return;
} }