diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2019-05-19 11:38:10 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-05 22:50:21 +0100 |
| commit | c926184bca6d0b45faebc44a14161bd767e23b83 (patch) | |
| tree | 2a93bfa08b7ba7a9444854d90a8bbc44dfc77cd9 /src/server/game/Movement/MotionMaster.cpp | |
| parent | db9408c81d00bf3ddba35f49dd94a3db9a524e7f (diff) | |
Core/Movement: move DelayedAction into MotionMaster and add a couple defines
(cherry picked from commit 2b78c70810cba22492b2586c6d79a90849d74ff9)
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index f76c79696fe..4c508a38b59 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -97,7 +97,7 @@ void MotionMaster::Initialize() { if (HasFlag(MOTIONMASTER_FLAG_UPDATE)) { - std::function<void()> action = [this]() + DelayedActionDefine action = [this]() { Initialize(); }; @@ -324,7 +324,7 @@ void MotionMaster::Add(MovementGenerator* movement, MovementSlot slot/* = MOTION if (HasFlag(MOTIONMASTER_FLAG_UPDATE)) { - std::function<void()> action = [this, movement, slot]() + DelayedActionDefine action = [this, movement, slot]() { Add(movement, slot); }; @@ -341,7 +341,7 @@ void MotionMaster::Remove(MovementGenerator* movement, MovementSlot slot/* = MOT if (HasFlag(MOTIONMASTER_FLAG_UPDATE)) { - std::function<void()> action = [this, movement, slot]() + DelayedActionDefine action = [this, movement, slot]() { Remove(movement, slot); }; @@ -379,7 +379,7 @@ void MotionMaster::Remove(MovementGeneratorType type, MovementSlot slot/* = MOTI if (HasFlag(MOTIONMASTER_FLAG_UPDATE)) { - std::function<void()> action = [this, type, slot]() + DelayedActionDefine action = [this, type, slot]() { Remove(type, slot); }; @@ -417,7 +417,7 @@ void MotionMaster::Clear() { if (HasFlag(MOTIONMASTER_FLAG_UPDATE)) { - std::function<void()> action = [this]() + DelayedActionDefine action = [this]() { Clear(); }; @@ -436,7 +436,7 @@ void MotionMaster::Clear(MovementSlot slot) if (HasFlag(MOTIONMASTER_FLAG_UPDATE)) { - std::function<void()> action = [this, slot]() + DelayedActionDefine action = [this, slot]() { Clear(slot); }; @@ -464,7 +464,7 @@ void MotionMaster::Clear(MovementGeneratorMode mode) { if (HasFlag(MOTIONMASTER_FLAG_UPDATE)) { - std::function<void()> action = [this, mode]() + DelayedActionDefine action = [this, mode]() { Clear(mode); }; @@ -486,7 +486,7 @@ void MotionMaster::Clear(MovementGeneratorPriority priority) { if (HasFlag(MOTIONMASTER_FLAG_UPDATE)) { - std::function<void()> action = [this, priority]() + DelayedActionDefine action = [this, priority]() { Clear(priority); }; |