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/SpellHandler.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/server/game/Handlers/SpellHandler.cpp') diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index 207f86fb74e..d4ed883e680 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -39,7 +39,7 @@ void WorldSession::HandleUseItemOpcode(WorldPackets::Spells::UseItem& packet) Player* user = _player; // ignore for remote control state - if (user->m_mover != user) + if (user->m_unitMovedByMe != user) return; Item* item = user->GetUseableItemByPos(packet.PackSlot, packet.Slot); @@ -131,7 +131,7 @@ void WorldSession::HandleOpenItemOpcode(WorldPackets::Spells::OpenItem& packet) Player* player = _player; // ignore for remote control state - if (player->m_mover != player) + if (player->m_unitMovedByMe != player) return; TC_LOG_INFO("network", "bagIndex: %u, slot: %u", packet.Slot, packet.PackSlot); @@ -220,8 +220,8 @@ void WorldSession::HandleGameObjectUseOpcode(WorldPackets::GameObject::GameObjUs if (GameObject* obj = GetPlayer()->GetGameObjectIfCanInteractWith(packet.Guid)) { // ignore for remote control state - if (GetPlayer()->m_mover != GetPlayer()) - if (!(GetPlayer()->IsOnVehicle(GetPlayer()->m_mover) || GetPlayer()->IsMounted()) && !obj->GetGOInfo()->IsUsableMounted()) + if (GetPlayer()->m_unitMovedByMe != GetPlayer()) + if (!(GetPlayer()->IsOnVehicle(GetPlayer()->m_unitMovedByMe) || GetPlayer()->IsMounted()) && !obj->GetGOInfo()->IsUsableMounted()) return; obj->Use(GetPlayer()); @@ -231,7 +231,7 @@ void WorldSession::HandleGameObjectUseOpcode(WorldPackets::GameObject::GameObjUs void WorldSession::HandleGameobjectReportUse(WorldPackets::GameObject::GameObjReportUse& packet) { // ignore for remote control state - if (_player->m_mover != _player) + if (_player->m_unitMovedByMe != _player) return; if (GameObject* go = GetPlayer()->GetGameObjectIfCanInteractWith(packet.Guid)) @@ -246,7 +246,7 @@ void WorldSession::HandleGameobjectReportUse(WorldPackets::GameObject::GameObjRe void WorldSession::HandleCastSpellOpcode(WorldPackets::Spells::CastSpell& cast) { // ignore for remote control state (for player case) - Unit* mover = _player->m_mover; + Unit* mover = _player->m_unitMovedByMe; if (mover != _player && mover->GetTypeId() == TYPEID_PLAYER) return; @@ -427,7 +427,7 @@ void WorldSession::HandleCancelAutoRepeatSpellOpcode(WorldPackets::Spells::Cance void WorldSession::HandleCancelChanneling(WorldPackets::Spells::CancelChannelling& /*cancelChanneling*/) { // ignore for remote control state (for player case) - Unit* mover = _player->m_mover; + Unit* mover = _player->m_unitMovedByMe; if (mover != _player && mover->GetTypeId() == TYPEID_PLAYER) return; @@ -437,7 +437,7 @@ void WorldSession::HandleCancelChanneling(WorldPackets::Spells::CancelChannellin void WorldSession::HandleTotemDestroyed(WorldPackets::Totem::TotemDestroyed& totemDestroyed) { // ignore for remote control state - if (_player->m_mover != _player) + if (_player->m_unitMovedByMe != _player) return; uint8 slotId = totemDestroyed.Slot; -- cgit v1.2.3