TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-23 13:25:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

afxEffectWrapper membervar cleanup

Browse source
This commit is contained in:
Azaezel 2018-03-29 17:46:57 -05:00
parent 0df2cf1b9d
commit b6076c55dd
36 changed files with 531 additions and 533 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/afx/ea/afxEA_AreaDamage.cpp
View file

@ -133,7 +133,7 @@ void afxEA_AreaDamage::do_runtime_substitutions()
// clone the datablock and perform substitutions
afxAreaDamageData* orig_db = damage_data;
damage_data = new afxAreaDamageData(*orig_db, true);
orig_db->performSubstitutions(damage_data, choreographer, group_index);
orig_db->performSubstitutions(damage_data, mChoreographer, mGroup_index);
}
}
@ -204,8 +204,8 @@ void afxEA_AreaDamage::notify_damage_source(ShapeBase* damaged, F32 damage, cons
char *posArg = Con::getArgBuffer(64);
dSprintf(posArg, 64, "%f %f %f", pos.x, pos.y, pos.z);
Con::executef(choreographer->getDataBlock(), "onInflictedAreaDamage",
choreographer->getIdString(),
Con::executef(mChoreographer->getDataBlock(), "onInflictedAreaDamage",
mChoreographer->getIdString(),
damaged->getIdString(),
Con::getFloatArg(damage),
flavor,
@ -221,7 +221,7 @@ void afxEA_AreaDamage::apply_damage(ShapeBase* shape, F32 damage, const char* fl
dSprintf(posArg, 64, "%f %f %f", pos.x, pos.y, pos.z);
Con::executef(shape, "damage",
choreographer->getIdString(),
mChoreographer->getIdString(),
posArg,
Con::getFloatArg(damage),
flavor);