From 146b2560aa8a7d0fc8a90ec3af70d1a8e01e514d Mon Sep 17 00:00:00 2001 From: megamage Date: Fri, 13 Mar 2009 14:42:57 -0600 Subject: *Call stopmoving in moveidle. --HG-- branch : trunk --- src/bindings/scripts/include/sc_creature.cpp | 1 - src/bindings/scripts/scripts/creature/mob_event_ai.cpp | 2 -- src/bindings/scripts/scripts/zone/azshara/azshara.cpp | 4 +--- src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp | 8 ++++---- src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp | 1 - .../scripts/zone/scarlet_monastery/boss_headless_horseman.cpp | 1 - .../scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp | 3 --- 7 files changed, 5 insertions(+), 15 deletions(-) (limited to 'src/bindings/scripts') diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index be37c66c740..f30ae9408c5 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -166,7 +166,6 @@ void ScriptedAI::DoStartNoMovement(Unit* victim) return; m_creature->GetMotionMaster()->MoveIdle(); - m_creature->StopMoving(); } void ScriptedAI::DoStopAttack() diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp index 54b29e07651..41a509cefa8 100644 --- a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp +++ b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp @@ -803,7 +803,6 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { m_creature->GetMotionMaster()->MoveIdle(); - m_creature->StopMoving(); } } break; @@ -1209,7 +1208,6 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI else { m_creature->GetMotionMaster()->MoveIdle(); - m_creature->StopMoving(); } } } diff --git a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp index 4ed71f89c55..d71101d4898 100644 --- a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp @@ -350,9 +350,7 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI DoScriptText(SAY_RIZZLE_FINAL, m_creature); m_creature->SetUInt32Value(UNIT_NPC_FLAGS, 1); m_creature->setFaction(35); - m_creature->StopMoving(); - m_creature->GetMotionMaster()->MovementExpired(); - m_creature->GetMotionMaster()->Clear(true); + m_creature->GetMotionMaster()->MoveIdle(); m_creature->RemoveAurasDueToSpell(SPELL_PERIODIC_DEPTH_CHARGE); Reached = true; } diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp index dba57924e56..1c2856fdd14 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp @@ -1079,8 +1079,8 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI Illidan->RemoveAurasDueToSpell(SPELL_KNEEL); m_creature->SetInFront(Illidan); Illidan->SetInFront(m_creature); - m_creature->StopMoving(); - Illidan->StopMoving(); + m_creature->GetMotionMaster()->MoveIdle(); + Illidan->GetMotionMaster()->MoveIdle(); ((boss_illidan_stormrageAI*)Illidan->AI())->AkamaGUID = m_creature->GetGUID(); ((boss_illidan_stormrageAI*)Illidan->AI())->EnterPhase(PHASE_TALK_SEQUENCE); } @@ -1912,8 +1912,8 @@ void boss_illidan_stormrageAI::HandleTalkSequence() Maiev->CastSpell(Maiev, SPELL_TELEPORT_VISUAL, true); // onoz she looks like she teleported! Maiev->SetInFront(m_creature); // Have her face us m_creature->SetInFront(Maiev); // Face her, so it's not rude =P - Maiev->StopMoving(); - m_creature->StopMoving(); + Maiev->GetMotionMaster()->MoveIdle(); + m_creature->GetMotionMaster()->MoveIdle(); }break; case 14: if(GETCRE(Maiev, MaievGUID)) diff --git a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp index 8478bdca284..2d4a644bf67 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp @@ -895,7 +895,6 @@ void PretendToDie(Creature* _Creature) { _Creature->InterruptNonMeleeSpells(false); _Creature->SetHealth(0); - _Creature->StopMoving(); _Creature->ClearComboPointHolders(); _Creature->RemoveAllAurasOnDeath(); _Creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false); diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp index 7bbbd4d4bc9..0bcfd6ba49b 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/boss_headless_horseman.cpp @@ -709,7 +709,6 @@ void mob_headAI::Disappear() m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->GetMotionMaster()->MoveIdle(); - m_creature->StopMoving(); ((boss_headless_horsemanAI*)body->AI())->returned = true; } } diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp index 7d22b76ac70..2cb92f07600 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp @@ -228,7 +228,6 @@ struct TRINITY_DLL_DECL advisorbase_ai : public ScriptedAI m_creature->InterruptNonMeleeSpells(false); m_creature->SetHealth(0); - m_creature->StopMoving(); m_creature->ClearComboPointHolders(); m_creature->RemoveAllAurasOnDeath(); m_creature->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false); @@ -864,7 +863,6 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI DoScriptText(SAY_PHASE5_NUTS, m_creature); - m_creature->StopMoving(); m_creature->GetMotionMaster()->Clear(); m_creature->GetMotionMaster()->MoveIdle(); DoTeleportTo(GRAVITY_X, GRAVITY_Y, GRAVITY_Z); @@ -928,7 +926,6 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI switch(GravityLapse_Phase) { case 0: - m_creature->StopMoving(); m_creature->GetMotionMaster()->Clear(); m_creature->GetMotionMaster()->MoveIdle(); DoTeleportTo(GRAVITY_X, GRAVITY_Y, GRAVITY_Z); -- cgit v1.2.3