From 9fdbbe851aa68f81022b3f9d814291701d0c8127 Mon Sep 17 00:00:00 2001 From: Ovalord <1Don7H4v3@m41L.com> Date: Sun, 21 Jan 2018 00:21:33 +0100 Subject: [PATCH] Core/Creature: moved reposition function to unit.cpp --- src/server/game/AI/CreatureAI.cpp | 2 +- src/server/game/AI/CreatureAI.h | 2 +- .../game/Entities/Creature/Creature.cpp | 23 +------------------ src/server/game/Entities/Creature/Creature.h | 3 --- src/server/game/Entities/Unit/Unit.cpp | 21 +++++++++++++++++ src/server/game/Entities/Unit/Unit.h | 2 +- 6 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 3161613a16..f3ee5e7b40 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -390,7 +390,7 @@ void CreatureAI::SetBoundary(CreatureBoundary const* boundary, bool negateBounda me->DoImmediateBoundaryCheck(); } -void CreatureAI::CheckDistanceToCurrentVictim() +void CreatureAI::CheckRepositionRequirements() { if (Unit* victim = me->GetVictim()) { diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h index d2fd45bcc4..8871bb010c 100644 --- a/src/server/game/AI/CreatureAI.h +++ b/src/server/game/AI/CreatureAI.h @@ -207,7 +207,7 @@ class TC_GAME_API CreatureAI : public UnitAI static bool IsInBounds(CreatureBoundary const& boundary, Position const* who); // Called every 3 Seconds to check if the creature needs to reposition itself - void CheckDistanceToCurrentVictim(); + void CheckRepositionRequirements(); protected: virtual void MoveInLineOfSight(Unit* /*who*/); diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index abdd0150ab..31dacfc7ff 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -632,7 +632,7 @@ void Creature::Update(uint32 diff) if (diff >= m_andvanceMovementTime) { - AI()->CheckDistanceToCurrentVictim(); + AI()->CheckRepositionRequirements(); m_andvanceMovementTime = 3000; } else @@ -728,27 +728,6 @@ void Creature::Update(uint32 diff) } } -void Creature::MoveAdvanceTo(Unit* target) -{ - if (!target) // Just in case - return; - - // Do not reposition ourself when we are not allowed to move - if (IsMovementPreventedByCasting() || isMoving() || !CanFreeMove()) - return; - - float x, y, z; - GetNearPoint(target, x, y, z, 0.0f, 0.0f, target->GetAngle(this)); - Movement::MoveSplineInit init(this); - init.MoveTo(x, y, z, true, false); - - // Beasts move backwards instead of turning arround - if (GetCreatureTemplate()->type == CREATURE_TYPE_BEAST) - init.SetOrientationFixed(true); - - init.Launch(); -} - void Creature::RegenerateMana() { uint32 curValue = GetPower(POWER_MANA); diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 7302e50837..1e276d88b4 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -734,9 +734,6 @@ class TC_GAME_API Creature : public Unit, public GridObject, public Ma bool CanGiveExperience() const; - // Handles the repositioning to the current target - void MoveAdvanceTo(Unit* target); - protected: bool CreateFromProto(ObjectGuid::LowType guidlow, uint32 entry, CreatureData const* data = nullptr, uint32 vehId = 0); bool InitEntry(uint32 entry, CreatureData const* data = nullptr); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index cb0d0e43a8..132fa69638 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -485,6 +485,27 @@ void Unit::MonsterMoveWithSpeed(float x, float y, float z, float speed, bool gen init.Launch(); } +void Unit::MoveAdvanceTo(Unit* target) +{ + if (!target) // Just in case + return; + + // Do not reposition ourself when we are not allowed to move + if (IsMovementPreventedByCasting() || isMoving() || !CanFreeMove()) + return; + + float x, y, z; + GetNearPoint(target, x, y, z, 0.0f, 0.0f, target->GetAngle(this)); + Movement::MoveSplineInit init(this); + init.MoveTo(x, y, z, true, false); + + // Beasts move backwards instead of turning arround + if (ToCreature() && ToCreature()->GetCreatureTemplate()->type == CREATURE_TYPE_BEAST) + init.SetOrientationFixed(true); + + init.Launch(); +} + void Unit::UpdateSplineMovement(uint32 t_diff) { if (movespline->Finalized()) diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 865d3f9389..90a2c74881 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1649,7 +1649,7 @@ class TC_GAME_API Unit : public WorldObject void JumpTo(WorldObject* obj, float speedZ, bool withOrientation = false); void MonsterMoveWithSpeed(float x, float y, float z, float speed, bool generatePath = false, bool forceDestination = false); - + void MoveAdvanceTo(Unit* target); void SendSetPlayHoverAnim(bool enable); void SendMovementSetSplineAnim(Movement::AnimType anim);