From b7287e85e4bc8acb2b95271ece9dd8a5b93873cd Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 1 Jan 2023 00:26:53 +0100 Subject: Core/Misc: Fixed deprecation warnings for c++20 (cherry picked from commit ba9bbbc9d0c3b80d8954ad6390d23ae3d0f804b2) --- src/server/game/Movement/MotionMaster.cpp | 6 +++--- src/server/game/Movement/Spline/MoveSpline.cpp | 7 ++----- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'src/server/game/Movement') diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index 636e121c2ab..4a137dcce91 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -686,7 +686,7 @@ void MotionMaster::MoveCloserAndStop(uint32 id, Unit* target, float distance) else { // We are already close enough. We just need to turn toward the target without changing position. - std::function initializer = [=, target = target->GetGUID()](Movement::MoveSplineInit& init) + std::function initializer = [=, this, target = target->GetGUID()](Movement::MoveSplineInit& init) { init.MoveTo(_owner->GetPositionX(), _owner->GetPositionY(), _owner->GetPositionZ()); init.SetFacing(target); @@ -840,7 +840,7 @@ void MotionMaster::MoveJump(float x, float y, float z, float o, float speedXY, f void MotionMaster::MoveCirclePath(float x, float y, float z, float radius, bool clockwise, uint8 stepCount) { - std::function initializer = [=](Movement::MoveSplineInit& init) + std::function initializer = [=, this](Movement::MoveSplineInit& init) { float step = 2 * float(M_PI) / stepCount * (clockwise ? -1.0f : 1.0f); Position const& pos = { x, y, z, 0.0f }; @@ -962,7 +962,7 @@ void MotionMaster::MoveFall(uint32 id/* = 0*/) return; } - std::function initializer = [=](Movement::MoveSplineInit& init) + std::function initializer = [=, this](Movement::MoveSplineInit& init) { init.MoveTo(_owner->GetPositionX(), _owner->GetPositionY(), tz + _owner->GetHoverOffset(), false); init.SetFall(); diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index ded1aa69521..21bd7068bb7 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -220,14 +220,11 @@ bool MoveSplineInitArgs::_checkPathBounds() const { if (!(flags & MoveSplineFlag::Mask_CatmullRom) && path.size() > 2) { - enum{ - MAX_OFFSET = (1 << 11) / 2 - }; + constexpr float MAX_OFFSET = float((1 << 11) / 2); Vector3 middle = (path.front()+path.back()) / 2; - Vector3 offset; for (uint32 i = 1; i < path.size()-1; ++i) { - offset = path[i] - middle; + Vector3 offset = path[i] - middle; if (std::fabs(offset.x) >= MAX_OFFSET || std::fabs(offset.y) >= MAX_OFFSET || std::fabs(offset.z) >= MAX_OFFSET) { TC_LOG_ERROR("misc", "MoveSplineInitArgs::_checkPathBounds check failed"); -- cgit v1.2.3