diff options
Diffstat (limited to 'src/game/TargetedMovementGenerator.cpp')
| -rw-r--r-- | src/game/TargetedMovementGenerator.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp index d5c4ed8b6b9..29325fe294f 100644 --- a/src/game/TargetedMovementGenerator.cpp +++ b/src/game/TargetedMovementGenerator.cpp @@ -57,47 +57,47 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner) if (!i_target.isValid() || !i_target->IsInWorld()) return false; - if( owner.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED) ) + if ( owner.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED) ) return false; float x, y, z; Traveller<T> traveller(owner); - if(i_destinationHolder.HasDestination()) + if (i_destinationHolder.HasDestination()) { - if(i_destinationHolder.HasArrived()) + if (i_destinationHolder.HasArrived()) { // prevent redundant micro-movement - if(!i_offset) + if (!i_offset) { - if(i_target->IsWithinMeleeRange(&owner)) + if (i_target->IsWithinMeleeRange(&owner)) return false; } - else if(!i_angle && !owner.hasUnitState(UNIT_STAT_FOLLOW)) + else if (!i_angle && !owner.hasUnitState(UNIT_STAT_FOLLOW)) { - if(i_target->IsWithinDistInMap(&owner, i_offset)) + if (i_target->IsWithinDistInMap(&owner, i_offset)) return false; } else { - if(i_target->IsWithinDistInMap(&owner, i_offset + 1.0f)) + if (i_target->IsWithinDistInMap(&owner, i_offset + 1.0f)) return false; } } else { bool stop = false; - if(!i_offset) + if (!i_offset) { - if(i_target->IsWithinMeleeRange(&owner, 0)) + if (i_target->IsWithinMeleeRange(&owner, 0)) stop = true; } - else if(!i_angle && !owner.hasUnitState(UNIT_STAT_FOLLOW)) + else if (!i_angle && !owner.hasUnitState(UNIT_STAT_FOLLOW)) { - if(i_target->IsWithinDist(&owner, i_offset * 0.8f)) + if (i_target->IsWithinDist(&owner, i_offset * 0.8f)) stop = true; } - if(stop) + if (stop) { owner.GetPosition(x, y, z); i_destinationHolder.SetDestination(traveller, x, y, z); @@ -107,16 +107,16 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner) } } - if(i_target->GetExactDistSq(i_targetX, i_targetY, i_targetZ) < 0.01f) + if (i_target->GetExactDistSq(i_targetX, i_targetY, i_targetZ) < 0.01f) return false; } - if(!i_offset) + if (!i_offset) { // to nearest random contact position i_target->GetRandomContactPoint( &owner, x, y, z, 0, MELEE_RANGE - 0.5f ); } - else if(!i_angle && !owner.hasUnitState(UNIT_STAT_FOLLOW)) + else if (!i_angle && !owner.hasUnitState(UNIT_STAT_FOLLOW)) { // caster chase i_target->GetContactPoint(&owner, x, y, z, i_offset * urand(80, 95) * 0.01f); @@ -140,7 +140,7 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner) //We don't update Mob Movement, if the difference between New destination and last destination is < BothObjectSize float bothObjectSize = i_target->GetObjectSize() + owner.GetObjectSize() + CONTACT_DISTANCE; - if( i_destinationHolder.HasDestination() && i_destinationHolder.GetDestinationDiff(x,y,z) < bothObjectSize ) + if ( i_destinationHolder.HasDestination() && i_destinationHolder.GetDestinationDiff(x,y,z) < bothObjectSize ) return; */ i_destinationHolder.SetDestination(traveller, x, y, z); @@ -219,7 +219,7 @@ TargetedMovementGenerator<T>::Update(T &owner, const uint32 & time_diff) if (i_targetX != i_target->GetPositionX() || i_targetY != i_target->GetPositionY() || i_targetZ != i_target->GetPositionZ()) { - if(_setTargetLocation(owner) || !owner.hasUnitState(UNIT_STAT_FOLLOW)) + if (_setTargetLocation(owner) || !owner.hasUnitState(UNIT_STAT_FOLLOW)) owner.SetInFront(i_target.getTarget()); i_target->GetPosition(i_targetX, i_targetY, i_targetZ); } @@ -231,7 +231,7 @@ TargetedMovementGenerator<T>::Update(T &owner, const uint32 & time_diff) owner.SetInFront(i_target.getTarget()); owner.StopMoving(); - if(owner.IsWithinMeleeRange(i_target.getTarget()) && !owner.hasUnitState(UNIT_STAT_FOLLOW)) + if (owner.IsWithinMeleeRange(i_target.getTarget()) && !owner.hasUnitState(UNIT_STAT_FOLLOW)) owner.Attack(i_target.getTarget(),true); } } |