TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-23 08:33:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

afx magic spell membervar cleanup (plus an additional shadowvar one in magic missile)

Browse source
This commit is contained in:
Azaezel 2018-03-29 03:41:34 -05:00
parent 1164ffb590
commit 3ae1f7e73a
3 changed files with 685 additions and 685 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Engine/source/afx/afxMagicMissile.cpp
View file

@ -532,9 +532,9 @@ bool afxMagicMissileData::preload(bool server, String &errorStr)
Con::errorf(ConsoleLogEntry::General, "ProjectileData::preload: Invalid packet, bad datablockId(decal): %d", decalId);
*/
String errorStr;
if( !sfxResolve( &sound, errorStr ) )
Con::errorf(ConsoleLogEntry::General, "afxMagicMissileData::preload: Invalid packet: %s", errorStr.c_str());
String sfxErrorStr;
if( !sfxResolve( &sound, sfxErrorStr) )
Con::errorf(ConsoleLogEntry::General, "afxMagicMissileData::preload: Invalid packet: %s", sfxErrorStr.c_str());
if (!lightDesc && lightDescId != 0)
if (Sim::findObject(lightDescId, lightDesc) == false)
@ -1864,7 +1864,7 @@ SceneObject* afxMagicMissile::get_default_launcher() const
if (mDataBlock->reverse_targeting)
{
if (dynamic_cast<afxMagicSpell*>(choreographer))
launch_cons_obj = ((afxMagicSpell*)choreographer)->target;
launch_cons_obj = ((afxMagicSpell*)choreographer)->mTarget;
if (!launch_cons_obj)
{
Con::errorf("afxMagicMissile::get_launch_data(): missing target constraint object for reverse targeted missile.");
@ -1874,7 +1874,7 @@ SceneObject* afxMagicMissile::get_default_launcher() const
else
{
if (dynamic_cast<afxMagicSpell*>(choreographer))
launch_cons_obj = ((afxMagicSpell*)choreographer)->caster;
launch_cons_obj = ((afxMagicSpell*)choreographer)->mCaster;
if (!launch_cons_obj)
{
Con::errorf("afxMagicMissile::get_launch_data(): missing launch constraint object missile.");
@ -2036,17 +2036,17 @@ void afxMagicMissile::launch()
{
if (mDataBlock->reverse_targeting)
{
missile_target = spell->caster;
collide_exempt = spell->target;
missile_target = spell->mCaster;
collide_exempt = spell->mTarget;
}
else
{
missile_target = spell->target;
collide_exempt = spell->caster;
missile_target = spell->mTarget;
collide_exempt = spell->mCaster;
}
if (spell->caster)
processAfter(spell->caster);
if (spell->mCaster)
processAfter(spell->mCaster);
if (missile_target)
deleteNotify(missile_target);
if (collide_exempt)