diff options
| -rw-r--r-- | src/server/game/Movement/Spline/Spline.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Movement/Spline/Spline.h | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/server/game/Movement/Spline/Spline.cpp b/src/server/game/Movement/Spline/Spline.cpp index be832c66861..a1e6969a38d 100644 --- a/src/server/game/Movement/Spline/Spline.cpp +++ b/src/server/game/Movement/Spline/Spline.cpp @@ -27,7 +27,7 @@ SplineBase::EvaluationMethtod SplineBase::evaluators[SplineBase::ModesEnd] = &SplineBase::EvaluateLinear, &SplineBase::EvaluateCatmullRom, &SplineBase::EvaluateBezier3, - (EvaluationMethtod)&SplineBase::UninitializedSpline, + &SplineBase::UninitializedSplineEvaluationMethod, }; SplineBase::EvaluationMethtod SplineBase::derivative_evaluators[SplineBase::ModesEnd] = @@ -35,7 +35,7 @@ SplineBase::EvaluationMethtod SplineBase::derivative_evaluators[SplineBase::Mode &SplineBase::EvaluateDerivativeLinear, &SplineBase::EvaluateDerivativeCatmullRom, &SplineBase::EvaluateDerivativeBezier3, - (EvaluationMethtod)&SplineBase::UninitializedSpline, + &SplineBase::UninitializedSplineEvaluationMethod, }; SplineBase::SegLenghtMethtod SplineBase::seglengths[SplineBase::ModesEnd] = @@ -43,7 +43,7 @@ SplineBase::SegLenghtMethtod SplineBase::seglengths[SplineBase::ModesEnd] = &SplineBase::SegLengthLinear, &SplineBase::SegLengthCatmullRom, &SplineBase::SegLengthBezier3, - (SegLenghtMethtod)&SplineBase::UninitializedSpline, + &SplineBase::UninitializedSplineSegLenghtMethod, }; SplineBase::InitMethtod SplineBase::initializers[SplineBase::ModesEnd] = @@ -52,7 +52,7 @@ SplineBase::InitMethtod SplineBase::initializers[SplineBase::ModesEnd] = &SplineBase::InitCatmullRom, // we should use catmullrom initializer even for linear mode! (client's internal structure limitation) &SplineBase::InitCatmullRom, &SplineBase::InitBezier3, - (InitMethtod)&SplineBase::UninitializedSpline, + &SplineBase::UninitializedSplineInitMethod, }; /////////// diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index c1c089d9dec..9bdc77f9427 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -85,7 +85,9 @@ protected: typedef void (SplineBase::*InitMethtod)(Vector3 const*, index_type, index_type); static InitMethtod initializers[ModesEnd]; - void UninitializedSpline() const { ABORT();} + void UninitializedSplineEvaluationMethod(index_type, float, Vector3&) const { ABORT(); } + float UninitializedSplineSegLenghtMethod(index_type) const { ABORT(); return 0.0f; } + void UninitializedSplineInitMethod(Vector3 const*, index_type, index_type) { ABORT(); } public: |