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

Clang format ConeDirectional

Browse Source
This commit is contained in:
Michael Cook (mackal) 2016-10-14 13:52:01 -04:00
parent 1e865a5246
commit c90a436db3
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
zone/spells.cpp
View File

@ -5673,45 +5673,45 @@ void Mob::ConeDirectional(uint16 spell_id, int16 resist_adjust)
float angle_start = spells[spell_id].directional_start + (GetHeading() * 360.0f / 256.0f); float angle_start = spells[spell_id].directional_start + (GetHeading() * 360.0f / 256.0f);
float angle_end = spells[spell_id].directional_end + (GetHeading() * 360.0f / 256.0f); float angle_end = spells[spell_id].directional_end + (GetHeading() * 360.0f / 256.0f);
while(angle_start > 360.0f) while (angle_start > 360.0f)
angle_start -= 360.0f; angle_start -= 360.0f;
while(angle_end > 360.0f) while (angle_end > 360.0f)
angle_end -= 360.0f; angle_end -= 360.0f;
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].aoerange, spells[spell_id].aoerange / 2, targets_in_range); entity_list.GetTargetsForConeArea(this, spells[spell_id].min_range, spells[spell_id].aoerange,
iter = targets_in_range.begin(); spells[spell_id].aoerange / 2, targets_in_range);
auto iter = targets_in_range.begin();
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; ++iter;
continue; continue;
} }
float heading_to_target = (CalculateHeadingToTarget((*iter)->GetX(), (*iter)->GetY()) * 360.0f / 256.0f); float heading_to_target =
(CalculateHeadingToTarget((*iter)->GetX(), (*iter)->GetY()) * 360.0f / 256.0f);
while(heading_to_target < 0.0f) while (heading_to_target < 0.0f)
heading_to_target += 360.0f; heading_to_target += 360.0f;
while(heading_to_target > 360.0f) while (heading_to_target > 360.0f)
heading_to_target -= 360.0f; heading_to_target -= 360.0f;
if(angle_start > angle_end){ if (angle_start > angle_end) {
if((heading_to_target >= angle_start && heading_to_target <= 360.0f) || (heading_to_target >= 0.0f && heading_to_target <= angle_end)){ if ((heading_to_target >= angle_start && heading_to_target <= 360.0f) ||
if(CheckLosFN((*iter)) || spells[spell_id].npc_no_los){ (heading_to_target >= 0.0f && heading_to_target <= angle_end)) {
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);
maxtarget_count++; maxtarget_count++;
} }
} }
} } else {
else{ if (heading_to_target >= angle_start && heading_to_target <= angle_end) {
if(heading_to_target >= angle_start && heading_to_target <= angle_end){ 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);
maxtarget_count++; maxtarget_count++;