josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Do not change dest when target does not move for targeted movement.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-22 03:07:52 -05:00
parent 8a44eff53a
commit 6e6d10e3e9
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/TargetedMovementGenerator.cpp
+6 -4
View File
@@ -61,6 +61,10 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner)
return; return;
} }
// chaser is on the way, and target did not move much
if(GetDestination(x, y, z) && i_target->IsWithinDist3d(x, y, z, 0.3f))
return;
if(!i_offset) if(!i_offset)
{ {
// to nearest random contact position // to nearest random contact position
@@ -111,7 +115,6 @@ TargetedMovementGenerator<T>::Initialize(T &owner)
if (owner.GetTypeId() == TYPEID_UNIT && ((Creature*)&owner)->canFly()) if (owner.GetTypeId() == TYPEID_UNIT && ((Creature*)&owner)->canFly())
owner.AddUnitMovementFlag(MOVEMENTFLAG_FLYING2); owner.AddUnitMovementFlag(MOVEMENTFLAG_FLYING2);
_setTargetLocation(owner); _setTargetLocation(owner);
} }
@@ -158,7 +161,7 @@ TargetedMovementGenerator<T>::Update(T &owner, const uint32 & time_diff)
if( !i_destinationHolder.HasDestination() ) if( !i_destinationHolder.HasDestination() )
_setTargetLocation(owner); _setTargetLocation(owner);
if( owner.IsStopped() && !i_destinationHolder.HasArrived() ) else if( owner.IsStopped() && !i_destinationHolder.HasArrived() )
{ {
owner.addUnitState(UNIT_STAT_CHASE); owner.addUnitState(UNIT_STAT_CHASE);
if (owner.GetTypeId() == TYPEID_UNIT && ((Creature*)&owner)->canFly()) if (owner.GetTypeId() == TYPEID_UNIT && ((Creature*)&owner)->canFly())
@@ -180,8 +183,7 @@ TargetedMovementGenerator<T>::Update(T &owner, const uint32 & time_diff)
// try to counter precision differences // try to counter precision differences
//if( i_destinationHolder.GetDistance2dFromDestSq(*i_target.getTarget()) >= dist * dist) //if( i_destinationHolder.GetDistance2dFromDestSq(*i_target.getTarget()) >= dist * dist)
if(i_offset ? !i_target->IsWithinDistInMap(&owner,2*i_offset) if(i_offset ? !i_target->IsWithinDistInMap(&owner, i_offset + 1.0f) : !i_target->IsWithinMeleeRange(&owner))
: !i_target->IsWithinMeleeRange(&owner))
{ {
owner.SetInFront(i_target.getTarget()); // Set new Angle For Map:: owner.SetInFront(i_target.getTarget()); // Set new Angle For Map::
_setTargetLocation(owner); //Calculate New Dest and Send data To Player _setTargetLocation(owner); //Calculate New Dest and Send data To Player
src/game/TargetedMovementGenerator.h
+1 -1
View File
@@ -57,7 +57,7 @@ class TRINITY_DLL_SPEC TargetedMovementGenerator
bool GetDestination(float &x, float &y, float &z) const bool GetDestination(float &x, float &y, float &z) const
{ {
if(i_destinationHolder.HasArrived()) return false; if(i_destinationHolder.HasArrived() || !i_destinationHolder.HasDestination()) return false;
i_destinationHolder.GetDestination(x,y,z); i_destinationHolder.GetDestination(x,y,z);
return true; return true;
} }