diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-12-31 18:12:36 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2025-01-01 20:59:52 +0100 |
| commit | 435864761e1de4be4bc8a344dec8e787ddbe636b (patch) | |
| tree | 93c747b367f81efca05b90ff637051616a5b6408 /src/server/game/Movement/MotionMaster.cpp | |
| parent | af13de7f211903586da97ee21e2c9be52ac2b58c (diff) | |
Core/Misc: Include cleanup - remove MapUtils.h from Containers.h
(cherry picked from commit d778d5ec7cfa94d6de2500e1fff7ae3bd30be18f)
# Conflicts:
# src/server/game/Achievements/CriteriaHandler.cpp
# src/server/game/Globals/ObjectMgr.cpp
# src/server/scripts/BrokenIsles/zone_mardum.cpp
# src/server/scripts/ExilesReach/zone_exiles_reach.cpp
# src/server/scripts/Shadowlands/SepulcherOfTheFirstOnes/boss_anduin_wrynn.cpp
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 190eec705f0..77491da63b7 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -16,24 +16,19 @@ */ #include "MotionMaster.h" -#include "AbstractFollower.h" #include "Creature.h" #include "CreatureAISelector.h" -#include "Containers.h" #include "DB2Stores.h" #include "Errors.h" #include "G3DPosition.hpp" #include "Log.h" -#include "Map.h" +#include "MapUtils.h" +#include "Memory.h" #include "MoveSpline.h" -#include "MoveSplineInit.h" #include "ObjectAccessor.h" #include "PathGenerator.h" -#include "PetDefines.h" #include "Player.h" #include "ScriptSystem.h" -#include "Unit.h" -#include "WaypointDefines.h" #include <algorithm> #include <iterator> @@ -46,7 +41,6 @@ #include "GenericMovementGenerator.h" #include "HomeMovementGenerator.h" #include "IdleMovementGenerator.h" -#include "Memory.h" #include "PointMovementGenerator.h" #include "RandomMovementGenerator.h" #include "SplineChainMovementGenerator.h" @@ -1036,7 +1030,7 @@ void MotionMaster::MoveFall(uint32 id /*= 0*/, if (tz <= INVALID_HEIGHT) { TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveFall: '{}', unable to retrieve a proper height at map Id: {} (X: {}, Y: {}, Z: {})", - _owner->GetGUID(), _owner->GetMap()->GetId(), _owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ()); + _owner->GetGUID(), _owner->GetMapId(), _owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ()); return; } |