aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeleqraph <nyrdeveloper@gmail.com>2022-07-24 22:20:35 +0200
committerGitHub <noreply@github.com>2022-07-24 22:20:35 +0200
commit96295cfc5fdd6790313eda694da99ee661f3c0f0 (patch)
treea638be843542d89236699ea920ac2dccecff937b
parent3598d280ff67d1653d9e1d61cbd32d12d41bc1d7 (diff)
Core/Units: Removed spline speed limit for MoveJumpWithGravity (#28142)
-rw-r--r--src/server/game/Movement/MotionMaster.cpp1
-rw-r--r--src/server/game/Movement/Spline/MoveSplineInit.h6
2 files changed, 7 insertions, 0 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index e7dc9d6f632..fd6acc752af 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -873,6 +873,7 @@ void MotionMaster::MoveJumpWithGravity(Position const& pos, float speedXY, float
init.SetParabolicVerticalAcceleration(gravity, 0);
init.SetUncompressed();
init.SetVelocity(speedXY);
+ init.SetUnlimitedSpeed();
if (hasOrientation)
init.SetFacing(pos.GetOrientation());
if (effect)
diff --git a/src/server/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h
index 40ee986c0c8..7145d9fcc65 100644
--- a/src/server/game/Movement/Spline/MoveSplineInit.h
+++ b/src/server/game/Movement/Spline/MoveSplineInit.h
@@ -146,6 +146,11 @@ namespace Movement
*/
void SetOrientationFixed(bool enable);
+ /* Enables no-speed limit
+ * if not set, the speed will be limited by certain flags to 50.0f, and otherwise 28.0f
+ */
+ void SetUnlimitedSpeed();
+
/* Sets the velocity (in case you want to have custom movement velocity)
* if no set, speed will be selected based on unit's speeds and current movement mode
* Has no effect if falling mode enabled
@@ -176,6 +181,7 @@ namespace Movement
inline void MoveSplineInit::SetTransportEnter() { args.flags.EnableTransportEnter(); }
inline void MoveSplineInit::SetTransportExit() { args.flags.EnableTransportExit(); }
inline void MoveSplineInit::SetOrientationFixed(bool enable) { args.flags.orientationFixed = enable; }
+ inline void MoveSplineInit::SetUnlimitedSpeed() { args.flags.unlimitedSpeed = true; }
inline void MoveSplineInit::SetParabolic(float amplitude, float time_shift)
{