From bc89e1cdb0da10e53cc9fa4a97565c05bb4c052e Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 1 Apr 2018 13:52:36 +0200 Subject: Core/Position: Refactor GetAngle -> GetAbsoluteAngle because code clarity is good. (cherry picked from commit 4692e10ca2ffed5ba2a0336e9c93962b0fad9eaa) --- src/server/scripts/Commands/cs_misc.cpp | 2 +- src/server/scripts/Commands/cs_npc.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index b96b66c0229..54426cf8471 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -468,7 +468,7 @@ public: float x, y, z; target->GetContactPoint(_player, x, y, z); - _player->TeleportTo(target->GetMapId(), x, y, z, _player->GetAngle(target), TELE_TO_GM_MODE); + _player->TeleportTo(target->GetMapId(), x, y, z, _player->GetAbsoluteAngle(target), TELE_TO_GM_MODE); PhasingHandler::InheritPhaseShift(_player, target); _player->UpdateObjectVisibility(); } diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index a177a4e904a..071c02394af 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -1733,7 +1733,7 @@ public: Player* chr = handler->GetSession()->GetPlayer(); - float followAngle = (creature->GetAngle(chr) - chr->GetOrientation()) * 180.0f / float(M_PI); + float followAngle = (creature->GetAbsoluteAngle(chr) - chr->GetOrientation()) * 180.0f / float(M_PI); float followDist = std::sqrt(std::pow(chr->GetPositionX() - creature->GetPositionX(), 2.f) + std::pow(chr->GetPositionY() - creature->GetPositionY(), 2.f)); uint32 groupAI = 0; sFormationMgr->AddFormationMember(lowguid, followAngle, followDist, leaderGUID, groupAI); -- cgit v1.2.3