From 346e4824beee7e23c5e93d94c72f38ec1cd06dbc Mon Sep 17 00:00:00 2001 From: Treeston Date: Sat, 20 Aug 2016 12:43:04 +0200 Subject: 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 --- src/server/game/Handlers/MovementHandler.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/game/Handlers/MovementHandler.cpp') 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; -- cgit v1.2.3