pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-31 06:12:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clang format BeamDirectional

Browse Source
This commit is contained in:
Michael Cook (mackal) 2016-10-14 13:58:20 -04:00
parent 05ed623056
commit 46cbd147b5
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zone/spells.cpp
View File

@ -5620,10 +5620,10 @@ void Mob::BeamDirectional(uint16 spell_id, int16 resist_adjust)
beneficial_targets = true; beneficial_targets = true;
std::list<Mob *> targets_in_range; std::list<Mob *> targets_in_range;
std::list<Mob*>::iterator iter;
entity_list.GetTargetsForConeArea(this, spells[spell_id].min_range, spells[spell_id].range, spells[spell_id].range / 2, targets_in_range); entity_list.GetTargetsForConeArea(this, spells[spell_id].min_range, spells[spell_id].range,
iter = targets_in_range.begin(); spells[spell_id].range / 2, targets_in_range);
auto iter = targets_in_range.begin();
float dX = 0; float dX = 0;
float dY = 0; float dY = 0;
@ -5636,10 +5636,9 @@ void Mob::BeamDirectional(uint16 spell_id, int16 resist_adjust)
float m = (dY - GetY()) / (dX - GetX()); float m = (dY - GetY()) / (dX - GetX());
float b = (GetY() * dX - dY * GetX()) / (dX - GetX()); float b = (GetY() * dX - dY * GetX()) / (dX - GetX());
while(iter != targets_in_range.end()) while (iter != targets_in_range.end()) {
{ if (!(*iter) || (beneficial_targets && ((*iter)->IsNPC() && !(*iter)->IsPetOwnerClient())) ||
if (!(*iter) || (beneficial_targets && ((*iter)->IsNPC() && !(*iter)->IsPetOwnerClient())) (*iter)->BehindMob(this, (*iter)->GetX(), (*iter)->GetY())) {
|| (*iter)->BehindMob(this, (*iter)->GetX(),(*iter)->GetY())){
++iter; ++iter;
continue; continue;
} }
@ -5647,8 +5646,7 @@ void Mob::BeamDirectional(uint16 spell_id, int16 resist_adjust)
//# shortest distance from line to target point //# shortest distance from line to target point
float d = std::abs((*iter)->GetY() - m * (*iter)->GetX() - b) / sqrt(m * m + 1); float d = std::abs((*iter)->GetY() - m * (*iter)->GetX() - b) / sqrt(m * m + 1);
if (d <= spells[spell_id].aoerange) if (d <= spells[spell_id].aoerange) {
{
if (CheckLosFN((*iter)) || spells[spell_id].npc_no_los) { if (CheckLosFN((*iter)) || spells[spell_id].npc_no_los) {
(*iter)->CalcSpellPowerDistanceMod(spell_id, 0, this); (*iter)->CalcSpellPowerDistanceMod(spell_id, 0, this);
SpellOnTarget(spell_id, (*iter), false, true, resist_adjust); SpellOnTarget(spell_id, (*iter), false, true, resist_adjust);