diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2017-04-07 21:35:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:35:23 +0200 |
| commit | 21b8c4997a260b5e2dc24ab07df17d3daa6b8b5d (patch) | |
| tree | f702e10246c1385acf7928fec24e192778d111f6 /src/server/game/Movement/MotionMaster.cpp | |
| parent | 5cb1555de6db43db03d6202b7edaa9c6835ecfab (diff) | |
[3.3.5] Core/Movement: MotionMaster & MovementGenerators cleaning (#19361)
Diffstat (limited to 'src/server/game/Movement/MotionMaster.cpp')
| -rw-r--r-- | src/server/game/Movement/MotionMaster.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp index c91fb0692df..4d5e2f9036b 100644 --- a/src/server/game/Movement/MotionMaster.cpp +++ b/src/server/game/Movement/MotionMaster.cpp @@ -75,7 +75,7 @@ void MotionMaster::InitDefault() if (_owner->GetTypeId() == TYPEID_UNIT) { MovementGenerator* movement = FactorySelector::selectMovementGenerator(_owner->ToCreature()); - Mutate(movement == NULL ? &si_idleMovement : movement, MOTION_SLOT_IDLE); + Mutate(movement == nullptr ? &si_idleMovement : movement, MOTION_SLOT_IDLE); } else { @@ -88,9 +88,6 @@ void MotionMaster::UpdateMotion(uint32 diff) if (!_owner) return; - if (_owner->HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED)) // what about UNIT_STATE_DISTRACTED? Why is this not included? - return; - ASSERT(!empty()); _cleanFlag |= MMCF_UPDATE; @@ -173,12 +170,12 @@ MovementGenerator* MotionMaster::GetMotionSlot(int slot) const return _slot[slot]; } -void MotionMaster::propagateSpeedChange() +void MotionMaster::PropagateSpeedChange() { for (int i = 0; i <= _top; ++i) { if (_slot[i]) - _slot[i]->unitSpeedChanged(); + _slot[i]->UnitSpeedChanged(); } } |