diff options
| author | ModoX <moardox@gmail.com> | 2024-09-21 05:33:30 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-09-21 05:50:21 +0200 |
| commit | 0e322fdbf40f91bd532bac045d46f69bd19416ae (patch) | |
| tree | 99d713d0a3362b07508ef3bb0c464f41caa64b76 /src | |
| parent | 974fb15360c32b7cc5b2b6a9b4f58de0739c449d (diff) | |
Core/Object: Added max height change param to MovePosition
(cherry picked from commit 35b8868763cc46a16511b11a5c735dc534e887dc)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 1672c286b2b..60485881c64 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -3511,7 +3511,7 @@ void WorldObject::GetContactPoint(WorldObject const* obj, float& x, float& y, fl GetNearPoint(obj, x, y, z, distance2d, GetAbsoluteAngle(obj)); } -void WorldObject::MovePosition(Position &pos, float dist, float angle) const +void WorldObject::MovePosition(Position &pos, float dist, float angle, float maxHeightChange /*= 6.0f*/) const { angle += GetOrientation(); float destx, desty, destz, ground, floor; @@ -3535,7 +3535,7 @@ void WorldObject::MovePosition(Position &pos, float dist, float angle) const for (uint8 j = 0; j < 10; ++j) { // do not allow too big z changes - if (std::fabs(pos.m_positionZ - destz) > 6) + if (std::fabs(pos.m_positionZ - destz) > maxHeightChange) { destx -= step * std::cos(angle); desty -= step * std::sin(angle); diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index d6d4cf85d9b..bb4e39a85ee 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -505,7 +505,7 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation void GetNearPoint2D(WorldObject const* searcher, float& x, float& y, float distance, float absAngle) const; void GetNearPoint(WorldObject const* searcher, float& x, float& y, float& z, float distance2d, float absAngle) const; void GetClosePoint(float& x, float& y, float& z, float size, float distance2d = 0, float relAngle = 0) const; - void MovePosition(Position &pos, float dist, float angle) const; + void MovePosition(Position &pos, float dist, float angle, float maxHeightChange = 6.0f) const; Position GetNearPosition(float dist, float angle); void MovePositionToFirstCollision(Position &pos, float dist, float angle) const; Position GetFirstCollisionPosition(float dist, float angle); |