diff options
author | Shauren <shauren.trinity@gmail.com> | 2013-06-30 16:31:24 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2013-06-30 16:31:24 +0200 |
commit | 112bc49c9a22a6998a9829940a72bfb3b4778bb9 (patch) | |
tree | d8b1a367d9ebc95275169c0cb3d5ecd3dc14d59c /src | |
parent | b3bdcc61ee757fd01a3356cd8b1b2f11e2ca712a (diff) |
Core/Units: Removed most calls to SendMovementFlagUpdate for creatures
Diffstat (limited to 'src')
14 files changed, 22 insertions, 58 deletions
diff --git a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp index ef6afbd6569..3cba9068139 100755 --- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp @@ -61,8 +61,8 @@ bool RotateMovementGenerator::Update(Unit* owner, uint32 diff) angle -= (float)diff * static_cast<float>(M_PI * 2) / m_maxDuration; while (angle < 0) angle += static_cast<float>(M_PI * 2); } - owner->SetOrientation(angle); - owner->SendMovementFlagUpdate(); // this is a hack. we do not have anything correct to send in the beginning + + owner->SetFacingTo(angle); if (m_duration > diff) m_duration -= diff; diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index 81e3eef1111..c37cdf80730 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -886,12 +886,10 @@ void Map::ScriptsProcess() if (!targetUnit) break; - sourceUnit->SetInFront(targetUnit); + sourceUnit->SetFacingToObject(targetUnit); } else - sourceUnit->SetOrientation(step.script->Orientation.Orientation); - - sourceUnit->SendMovementFlagUpdate(); + sourceUnit->SetFacingTo(step.script->Orientation.Orientation); } break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp index d975300c35b..b989e03a8a1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp @@ -256,33 +256,24 @@ public: case EVENT_TURN_TO_REND: if (Creature* victor = me->GetCreature(*me, victorGUID)) { - victor->SetInFront(me); - victor->SendMovementFlagUpdate(); + victor->SetFacingToObject(me); victor->HandleEmoteCommand(EMOTE_ONESHOT_TALK); } break; case EVENT_TURN_TO_PLAYER: if (Creature* victor = me->GetCreature(*me, victorGUID)) if (Unit* player = victor->SelectNearestPlayer(60.0f)) - { - victor->SetInFront(player); - victor->SendMovementFlagUpdate(); - } + victor->SetFacingToObject(player); break; case EVENT_TURN_TO_FACING_1: if (Creature* victor = me->GetCreature(*me, victorGUID)) - { - victor->SetOrientation(1.518436f); - victor->SendMovementFlagUpdate(); - } + victor->SetFacingTo(1.518436f); break; case EVENT_TURN_TO_FACING_2: - me->SetOrientation(1.658063f); - me->SendMovementFlagUpdate(); + me->SetFacingTo(1.658063f); break; case EVENT_TURN_TO_FACING_3: - me->SetOrientation(1.500983f); - me->SendMovementFlagUpdate(); + me->SetFacingTo(1.500983f); break; case EVENT_WAVES_EMOTE_1: if (Creature* victor = me->GetCreature(*me, victorGUID)) 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; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 5b6e7c39d94..81e1136f94f 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -242,8 +242,7 @@ public: { case 4: SetEscortPaused(true); - me->SetOrientation(1.775791f); - me->SendMovementFlagUpdate(); + me->SetFacingTo(1.775791f); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); Talk(SAY_MORRIDUNE_2); break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index e7251b13c2b..ca7e9915ec5 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -479,17 +479,15 @@ public: switch (uiWaypoint) { case 0: - me->SetOrientation(5.81f); + me->SetFacingTo(5.81f); break; case 1: - me->SetOrientation(4.60f); + me->SetFacingTo(4.60f); break; case 2: - me->SetOrientation(2.79f); + me->SetFacingTo(2.79f); break; } - - me->SendMovementFlagUpdate(); } } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index 468ffa58d1d..1d785001f72 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -191,10 +191,7 @@ public: return; if (uiPointId == 1) - { - me->SetOrientation(ORIENTATION); - me->SendMovementFlagUpdate(); - } + me->SetFacingTo(ORIENTATION); } void DoSummonGrandChampion(uint32 uiBoss) diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index ec7e0e2eebe..599e2b834a9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -300,8 +300,7 @@ class boss_devourer_of_souls : public CreatureScript DoCast(me, SPELL_WAILING_SOULS_STARTING); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - me->SetOrientation(me->GetAngle(target)); - me->SendMovementFlagUpdate(); + me->SetFacingToObject(target); DoCast(me, SPELL_WAILING_SOULS_BEAM); } @@ -327,8 +326,7 @@ class boss_devourer_of_souls : public CreatureScript case EVENT_WAILING_SOULS_TICK: beamAngle += beamAngleDiff; - me->SetOrientation(beamAngle); - me->SendMovementFlagUpdate(); + me->SetFacingTo(beamAngle); me->StopMoving(); DoCast(me, SPELL_WAILING_SOULS); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 576323d2891..11d816dcf53 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -204,7 +204,6 @@ class boss_blood_queen_lana_thel : public CreatureScript minchar->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); minchar->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); minchar->SetCanFly(false); - minchar->SendMovementFlagUpdate(); minchar->RemoveAllAuras(); minchar->GetMotionMaster()->MoveCharge(4629.3711f, 2782.6089f, 401.5301f, SPEED_CHARGE/3.0f); } @@ -237,7 +236,6 @@ class boss_blood_queen_lana_thel : public CreatureScript me->SetDisableGravity(true); me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); me->SetCanFly(true); - me->SendMovementFlagUpdate(); me->GetMotionMaster()->MovePoint(POINT_MINCHAR, mincharPos); } } @@ -251,7 +249,6 @@ class boss_blood_queen_lana_thel : public CreatureScript _killMinchar = false; me->SetDisableGravity(true); me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); - me->SetCanFly(true); me->GetMotionMaster()->MovePoint(POINT_MINCHAR, mincharPos); } else @@ -317,7 +314,6 @@ class boss_blood_queen_lana_thel : public CreatureScript me->SetDisableGravity(false); me->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); me->SetCanFly(false); - me->SendMovementFlagUpdate(); me->SetReactState(REACT_AGGRESSIVE); if (Unit* victim = me->SelectVictim()) AttackStart(victim); @@ -444,7 +440,6 @@ class boss_blood_queen_lana_thel : public CreatureScript me->SetDisableGravity(true); me->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); me->SetCanFly(true); - me->SendMovementFlagUpdate(); me->GetMotionMaster()->MovePoint(POINT_AIR, airPos); break; case EVENT_AIR_FLY_DOWN: diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index dd4d829201a..3f5a1021729 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -294,7 +294,6 @@ class boss_sapphiron : public CreatureScript case EVENT_LIFTOFF: Talk(EMOTE_AIR_PHASE); me->SetDisableGravity(true); - me->SendMovementFlagUpdate(); events.ScheduleEvent(EVENT_ICEBOLT, 1500); _iceboltCount = RAID_MODE(2, 3); return; @@ -339,7 +338,6 @@ class boss_sapphiron : public CreatureScript me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); Talk(EMOTE_GROUND_PHASE); me->SetDisableGravity(false); - me->SendMovementFlagUpdate(); events.ScheduleEvent(EVENT_GROUND, 1500); return; case EVENT_GROUND: diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index cd8837c9494..bd08a27d49d 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -325,8 +325,7 @@ public: break; case 7: Talk(SAY_SVALA_INTRO_2); - me->SetOrientation(1.58f); - me->SendMovementFlagUpdate(); + me->SetFacingTo(1.58f); arthas->SetVisible(false); ++introPhase; introTimer = 13800; diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 816fe22b21c..b0678c74695 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -2366,10 +2366,7 @@ public: me->StopMoving(); me->SetUInt32Value(UNIT_NPC_FLAGS, 0); if (Player* player = me->GetPlayer(*me, uiPlayerGUID)) - { - me->SetInFront(player); - me->SendMovementFlagUpdate(); - } + me->SetFacingToObject(player); uiEventTimer = 3000; uiEventPhase = 1; } @@ -2419,10 +2416,7 @@ public: case NPC_SALTY_JOHN_THORPE: Talk(SAY_HIDDEN_CULTIST_4); if (Player* player = me->GetPlayer(*me, uiPlayerGUID)) - { - me->SetInFront(player); - me->SendMovementFlagUpdate(); - } + me->SetFacingToObject(player); uiEventTimer = 3000; uiEventPhase = 3; break; diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 4e258486f23..68fdc16cfb0 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -1263,8 +1263,7 @@ public: _events.ScheduleEvent(EVENT_RECRUIT_1, 100); player->CLOSE_GOSSIP_MENU(); me->CastSpell(player, SPELL_QUEST_CREDIT, true); - me->SetInFront(player); - me->SendMovementFlagUpdate(); + me->SetFacingToObject(player); } private: diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 05111d4763f..c61a547d2c3 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -2293,8 +2293,7 @@ class spell_item_unusual_compass : public SpellScriptLoader void HandleDummy(SpellEffIndex /* effIndex */) { Unit* caster = GetCaster(); - caster->SetOrientation(frand(0.0f, 62832.0f) / 10000.0f); - caster->SendMovementFlagUpdate(true); + caster->SetFacingTo(frand(0.0f, 2.0f * M_PI)); } void Register() |