diff options
| -rw-r--r-- | src/server/game/Movement/MotionMaster.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h index afe61a6dd55..18c6e5c157f 100644 --- a/src/server/game/Movement/MotionMaster.h +++ b/src/server/game/Movement/MotionMaster.h @@ -82,14 +82,21 @@ struct MovementGeneratorInformation std::string TargetName; }; +static bool EmptyValidator() +{ + return true; +} + class MotionMasterDelayedAction { public: - explicit MotionMasterDelayedAction(std::function<void()>&& action, MotionMasterDelayedActionType type) : Action(std::move(action)), Type(type) { } + explicit MotionMasterDelayedAction(std::function<void()>&& action, std::function<bool()>&& validator, MotionMasterDelayedActionType type) : Action(std::move(action)), Validator(std::move(validator)), Type(type) { } + explicit MotionMasterDelayedAction(std::function<void()>&& action, MotionMasterDelayedActionType type) : Action(std::move(action)), Validator(EmptyValidator), Type(type) { } ~MotionMasterDelayedAction() { } - void Resolve() { Action(); } + void Resolve() { if (Validator()) Action(); } + std::function<bool()> Validator; std::function<void()> Action; uint8 Type; }; |