From 12a828fdbc01b9fca817829f9da3be2cf8cedf46 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 9 Apr 2013 17:24:39 +0200 Subject: Core/Movement * Implemented a generic way of sending movement packets depending on who controls the unit (player or server controlled) * Added possibility to specify extra elements in movement packets (such as speed, extra passenger guid, collision height and similar) without having to add a special element only for these * Removed Unit::SendMovementFlagUpdate as it was something working only in 3.3.5a and earlier (no serverside HEARTBEAT opcode exists now) --- src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp | 8 ++------ src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp | 3 +-- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'src/server/scripts/EasternKingdoms') diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index abaf900508c..e4929eed313 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -1001,10 +1001,7 @@ public: { case 1: if (Unit* car = Unit::GetCreature(*me, carGUID)) - { - me->SetInFront(car); - me->SendMovementFlagUpdate(); - } + me->SetFacingToObject(car); Talk(SAY_SCARLET_MINER_0); SetRun(true); IntroTimer = 4000; @@ -1013,8 +1010,7 @@ public: case 17: if (Unit* car = Unit::GetCreature(*me, carGUID)) { - me->SetInFront(car); - me->SendMovementFlagUpdate(); + me->SetFacingToObject(car); car->Relocate(car->GetPositionX(), car->GetPositionY(), me->GetPositionZ() + 1); car->StopMoving(); car->RemoveAura(SPELL_CART_DRAG); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp index ff6d434fa40..0c2c9597cfe 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp @@ -297,8 +297,7 @@ class npc_harrison_jones : public CreatureScript if (me->GetCreatureTemplate()->GossipMenuId == sender && !action) { player->CLOSE_GOSSIP_MENU(); - me->SetInFront(player); - me->SendMovementFlagUpdate(true); + me->SetFacingToObject(player); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); Talk(SAY_HARRISON_0); _gongEvent = GONG_EVENT_1; -- cgit v1.2.3