diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2016-08-20 12:43:04 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-02-12 16:24:25 +0100 |
| commit | 346e4824beee7e23c5e93d94c72f38ec1cd06dbc (patch) | |
| tree | 230102f9e28c8e46a385359b6e45047fac4c14e5 /src/server/game/Handlers/MovementHandler.cpp | |
| parent | 1091174f0363f730bc720185999edf120e92c50e (diff) | |
Entities/Unit: Cleanup refactor. Changes: (#17819)
+ Unit::m_movedPlayer -> Unit::m_playerMovingMe
+ Player::m_mover -> Player::m_unitMovedByMe
+ Unit::GetMover() -> Unit::GetUnitBeingMoved()
+ Unit::GetPlayerMover() -> Unit::GetPlayerBeingMoved()
+ NEW: Unit::GetClientControllingPlayer()
(cherry picked from commit 8deda7ed7f18615937ec5db2d30a6badc3b157c1)
# Conflicts:
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Entities/Unit/Unit.cpp
# src/server/game/Handlers/MiscHandler.cpp
# src/server/game/Handlers/MovementHandler.cpp
# src/server/game/Handlers/SpellHandler.cpp
# src/server/game/Server/WorldSession.cpp
# src/server/game/Spells/SpellEffects.cpp
# src/server/game/Spells/SpellInfo.cpp
Diffstat (limited to 'src/server/game/Handlers/MovementHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/MovementHandler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index 0d2325c691d..14b60e99d72 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -248,7 +248,7 @@ void WorldSession::HandleMoveTeleportAck(WorldPackets::Movement::MoveTeleportAck { TC_LOG_DEBUG("network", "CMSG_MOVE_TELEPORT_ACK: Guid: %s, Sequence: %u, Time: %u", packet.MoverGUID.ToString().c_str(), packet.AckIndex, packet.MoveTime); - Player* plMover = _player->m_mover->ToPlayer(); + Player* plMover = _player->m_unitMovedByMe->ToPlayer(); if (!plMover || !plMover->IsBeingTeleportedNear()) return; @@ -291,7 +291,7 @@ void WorldSession::HandleMovementOpcodes(WorldPackets::Movement::ClientPlayerMov { OpcodeClient opcode = packet.GetOpcode(); - Unit* mover = _player->m_mover; + Unit* mover = _player->m_unitMovedByMe; ASSERT(mover != nullptr); // there must always be a mover @@ -515,15 +515,15 @@ void WorldSession::HandleForceSpeedChangeAck(WorldPackets::Movement::MovementSpe void WorldSession::HandleSetActiveMoverOpcode(WorldPackets::Movement::SetActiveMover& packet) { if (GetPlayer()->IsInWorld()) - if (_player->m_mover->GetGUID() != packet.ActiveMover) - TC_LOG_DEBUG("network", "HandleSetActiveMoverOpcode: incorrect mover guid: mover is %s and should be %s" , packet.ActiveMover.ToString().c_str(), _player->m_mover->GetGUID().ToString().c_str()); + if (_player->m_unitMovedByMe->GetGUID() != packet.ActiveMover) + TC_LOG_DEBUG("network", "HandleSetActiveMoverOpcode: incorrect mover guid: mover is %s and should be %s" , packet.ActiveMover.ToString().c_str(), _player->m_unitMovedByMe->GetGUID().ToString().c_str()); } void WorldSession::HandleMoveKnockBackAck(WorldPackets::Movement::MovementAckMessage& movementAck) { GetPlayer()->ValidateMovementInfo(&movementAck.Ack.movementInfo); - if (_player->m_mover->GetGUID() != movementAck.Ack.movementInfo.guid) + if (_player->m_unitMovedByMe->GetGUID() != movementAck.Ack.movementInfo.guid) return; _player->m_movementInfo = movementAck.Ack.movementInfo; |
