TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +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

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

@ -40,7 +40,7 @@ void afxEffectVector::filter_client_server()
for (S32 i = 0; i < fx_v->size(); i++)
{
if ((*fx_v)[i]->datablock->runsHere(on_server))
if ((*fx_v)[i]->mDatablock->runsHere(on_server))
fx_v2->push_back((*fx_v)[i]);
else
{
@ -68,15 +68,15 @@ void afxEffectVector::calc_fx_dur_and_afterlife()
if (ew)
{
F32 ew_dur;
if (ew->ew_timing.lifetime < 0)
if (ew->mEW_timing.lifetime < 0)
{
if (phrase_dur > ew->ew_timing.delay)
if (phrase_dur > ew->mEW_timing.delay)
ew_dur = phrase_dur + ew->afterStopTime();
else
ew_dur = ew->ew_timing.delay + ew->afterStopTime();
ew_dur = ew->mEW_timing.delay + ew->afterStopTime();
}
else
ew_dur = ew->ew_timing.delay + ew->ew_timing.lifetime + ew->ew_timing.fade_out_time;
ew_dur = ew->mEW_timing.delay + ew->mEW_timing.lifetime + ew->mEW_timing.fade_out_time;
if (ew_dur > total_fx_dur)
total_fx_dur = ew_dur;