Skip to content

Commit

Permalink
add strikeObject functionality feature
Browse files Browse the repository at this point in the history
  • Loading branch information
Johxz committed Feb 1, 2017
1 parent 8b4b467 commit 3cd82d9
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 3 deletions.
40 changes: 38 additions & 2 deletions Engine/source/T3D/fx/lightning.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -863,11 +863,47 @@ void Lightning::strikeRandomPoint()
}

//--------------------------------------------------------------------------
void Lightning::strikeObject(ShapeBase*)
void Lightning::strikeObject(ShapeBase* targetObj)
{
AssertFatal(isServerObject(), "Error, client objects may not initiate lightning!");

AssertFatal(false, "Lightning::strikeObject is not implemented.");
Point3F strikePoint = targetObj->getPosition();
Point3F objectCenter;

targetObj->getObjBox().getCenter(&objectCenter);
objectCenter.convolve(targetObj->getScale());
targetObj->getTransform().mulP(objectCenter);

bool playerInWarmup = false;
Player *playerObj = dynamic_cast< Player * >(targetObj);
if (playerObj)
{
if (!playerObj->getControllingClient())
{
playerInWarmup = true;
}
}

if (!playerInWarmup)
{
applyDamage_callback(objectCenter, VectorF(0.0, 0.0, 1.0), targetObj);
}

SimGroup* pClientGroup = Sim::getClientGroup();
for (SimGroup::iterator itr = pClientGroup->begin(); itr != pClientGroup->end(); itr++) {
NetConnection* nc = static_cast<NetConnection*>(*itr);
if (nc != NULL)
{
LightningStrikeEvent* pEvent = new LightningStrikeEvent;
pEvent->mLightning = this;

pEvent->mStart.x = strikePoint.x;
pEvent->mStart.y = strikePoint.y;
pEvent->mTarget = targetObj;

nc->postNetEvent(pEvent);
}
}
}


Expand Down
2 changes: 1 addition & 1 deletion Engine/source/T3D/fx/lightning.h
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ class Lightning : public GameBase

void warningFlashes();
void strikeRandomPoint();
void strikeObject(ShapeBase*);
void strikeObject(ShapeBase* targetObj);
void processEvent(LightningStrikeEvent*);

DECLARE_CONOBJECT(Lightning);
Expand Down

0 comments on commit 3cd82d9

Please sign in to comment.