TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-21 20:35:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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/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" )
{
if (!effectData)
{
Con::errorf("afxPhraseEffectData::addEffect() -- failed to resolve effect datablock.");
Con::errorf("afxPhraseEffectData::pushEffect() -- failed to resolve effect datablock.");
return;
}