diff options
| author | megamage <none@none> | 2009-01-17 13:34:43 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-17 13:34:43 -0600 |
| commit | 8739ded05dbf68486551531024f1ad8ad7b389cf (patch) | |
| tree | 87f71484a1fa5b4578fc46bebafa4adc64078fc2 /src/game/Creature.cpp | |
| parent | fa2e6622ad9dca5051b451e14ea303670ec65fa6 (diff) | |
| parent | f414ab1686c300787e3dfb0c397227062b8feea6 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
| -rw-r--r-- | src/game/Creature.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index 8745d86caa9..424c4e1eaae 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1871,18 +1871,10 @@ void Creature::DoFleeToGetAssistance(float radius) // Optional parameter CellLock<GridReadGuard> cell_lock(cell, p); cell_lock->Visit(cell_lock, grid_creature_searcher, *(GetMap())); - if(!GetMotionMaster()->empty() && (GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE)) - GetMotionMaster()->Clear(false); - if(pCreature == NULL) - { - GetMotionMaster()->MoveIdle(); + if(!pCreature) GetMotionMaster()->MoveFleeing(getVictim()); - } else - { - GetMotionMaster()->MoveIdle(); GetMotionMaster()->MovePoint(0,pCreature->GetPositionX(),pCreature->GetPositionY(),pCreature->GetPositionZ()); - } } Unit* Creature::SelectNearestTarget(float dist) const @@ -2142,7 +2134,7 @@ bool Creature::HasSpellCooldown(uint32 spell_id) const bool Creature::IsInEvadeMode() const { - return !i_motionMaster.empty() && i_motionMaster.GetCurrentMovementGeneratorType() == HOME_MOTION_TYPE; + return /*!i_motionMaster.empty() &&*/ i_motionMaster.GetCurrentMovementGeneratorType() == HOME_MOTION_TYPE; } bool Creature::HasSpell(uint32 spellID) const |