diff options
-rw-r--r-- | src/server/game/Movement/Spline/MoveSpline.cpp | 5 | ||||
-rw-r--r-- | src/server/game/Movement/Spline/MoveSplineInit.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Movement/Spline/MoveSplineInitArgs.h | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/server/game/Movement/Spline/MoveSpline.cpp b/src/server/game/Movement/Spline/MoveSpline.cpp index 699d054be4b..67ea8646194 100644 --- a/src/server/game/Movement/Spline/MoveSpline.cpp +++ b/src/server/game/Movement/Spline/MoveSpline.cpp @@ -19,6 +19,7 @@ #include "MoveSpline.h" #include <sstream> #include "Log.h" +#include "Unit.h" namespace Movement{ @@ -195,12 +196,12 @@ MoveSpline::MoveSpline() : m_Id(0), time_passed(0), /// ============================================================================================ -bool MoveSplineInitArgs::Validate() const +bool bool MoveSplineInitArgs::Validate(Unit* unit) const { #define CHECK(exp) \ if (!(exp))\ {\ - sLog->outError(LOG_FILTER_GENERAL, "MoveSplineInitArgs::Validate: expression '%s' failed", #exp);\ + sLog->outError(LOG_FILTER_GENERAL, "MoveSplineInitArgs::Validate: expression '%s' failed for %u", #exp, unit->GetGUIDLow());\ return false;\ } CHECK(path.size() > 1); diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index fec629c3329..7d533593878 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -98,7 +98,7 @@ namespace Movement if (!args.HasVelocity) args.velocity = unit.GetSpeed(SelectSpeedType(moveFlags)); - if (!args.Validate()) + if (!args.Validate(&unit)) return; if (moveFlags & MOVEMENTFLAG_ROOT) diff --git a/src/server/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h index de02b35d0a0..32045629c9f 100644 --- a/src/server/game/Movement/Spline/MoveSplineInitArgs.h +++ b/src/server/game/Movement/Spline/MoveSplineInitArgs.h @@ -22,6 +22,8 @@ #include "MoveSplineFlag.h" #include <G3D/Vector3.h> +class Unit; + namespace Movement { typedef std::vector<Vector3> PointsArray; @@ -61,7 +63,7 @@ namespace Movement bool TransformForTransport; /** Returns true to show that the arguments were configured correctly and MoveSpline initialization will succeed. */ - bool Validate() const; + bool Validate(Unit* unit) const; private: bool _checkPathBounds() const; }; |