Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Movement: added optional velocity argument for MotionMaster::MoveTakeoff helper to manually specify velocity values

Browse Source
This commit is contained in:
Ovahlord
2020-09-29 17:40:31 +02:00
parent ece5fe65c0
commit f1ef08fc84
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Movement/MotionMaster.cpp
View File

@@ -343,7 +343,7 @@ void MotionMaster::MoveCloserAndStop(uint32 id, Unit* target, float distance)
}
}
void MotionMaster::MoveLand(uint32 id, Position const& pos, Optional<float> velocity /*= nullptr*/)
void MotionMaster::MoveLand(uint32 id, Position const& pos, Optional<float> velocity /*= { }*/)
{
TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveLand: '%s', landing point Id: %u (X: %f, Y: %f, Z: %f)", _owner->GetGUID().ToString().c_str(), id, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ());
@@ -357,7 +357,7 @@ void MotionMaster::MoveLand(uint32 id, Position const& pos, Optional<float> velo
Mutate(new GenericMovementGenerator(std::move(init), EFFECT_MOTION_TYPE, id), MOTION_SLOT_ACTIVE);
}
void MotionMaster::MoveTakeoff(uint32 id, Position const& pos)
void MotionMaster::MoveTakeoff(uint32 id, Position const& pos, Optional<float> velocity /*= { }*/)
{
TC_LOG_DEBUG("movement.motionmaster", "MotionMaster::MoveTakeoff: '%s', landing point Id: %u (X: %f, Y: %f, Z: %f)", _owner->GetGUID().ToString().c_str(), id, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ());
@@ -366,6 +366,8 @@ void MotionMaster::MoveTakeoff(uint32 id, Position const& pos)
init.SetSmooth();
init.SetFly();
init.SetAnimation(AnimationTier::Hover);
if (velocity)
init.SetVelocity(velocity.get());
Mutate(new GenericMovementGenerator(std::move(init), EFFECT_MOTION_TYPE, id), MOTION_SLOT_ACTIVE);
}

4
src/server/game/Movement/MotionMaster.h
View File

@@ -169,8 +169,8 @@ class TC_GAME_API MotionMaster
void MoveCloserAndStop(uint32 id, Unit* target, float distance);
// These two movement types should only be used with creatures having landing/takeoff animations
void MoveLand(uint32 id, Position const& pos, Optional<float> velocity = nullptr);
void MoveTakeoff(uint32 id, Position const& pos);
void MoveLand(uint32 id, Position const& pos, Optional<float> velocity = { });
void MoveTakeoff(uint32 id, Position const& pos, Optional<float> velocity = { });
void MoveCharge(float x, float y, float z, float speed = SPEED_CHARGE, uint32 id = EVENT_CHARGE, bool generatePath = false);
void MoveCharge(PathGenerator const& path, float speed = SPEED_CHARGE);