aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp4
-rw-r--r--src/scripts/northrend/grizzly_hills.cpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp
index 2adf1cb53a7..934a148afc6 100644
--- a/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp
+++ b/src/scripts/northrend/crusaders_coliseum/trial_of_the_champion/boss_argent_challenge.cpp
@@ -216,9 +216,9 @@ struct boss_paletressAI : public ScriptedAI
}
}
- void MovementInform(uint32 MovementType, uint32 Data)
+ void MovementInform(uint32 MovementType, uint32 Point)
{
- if (MovementType != POINT_MOTION_TYPE)
+ if (MovementType != POINT_MOTION_TYPE || Point != 0)
return;
if (pInstance)
diff --git a/src/scripts/northrend/grizzly_hills.cpp b/src/scripts/northrend/grizzly_hills.cpp
index 980c54df617..0ace860bb49 100644
--- a/src/scripts/northrend/grizzly_hills.cpp
+++ b/src/scripts/northrend/grizzly_hills.cpp
@@ -429,6 +429,7 @@ struct npc_tallhorn_stagAI : public ScriptedAI
void UpdateAI(const uint32 uiDiff)
{
+ // call this each update tick?
if (GameObject* haunch = me->FindNearestGameObject(OBJECT_HAUNCH, 2.0f))
{
me->SetStandState(UNIT_STAND_STATE_DEAD);
@@ -465,6 +466,7 @@ struct npc_amberpine_woodsmanAI : public ScriptedAI
void UpdateAI(const uint32 uiDiff)
{
+ // call this each update tick?
if (Creature* stag = me->FindNearestCreature(TALLHORN_STAG, 0.2f))
{
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USESTANDING);
@@ -493,8 +495,7 @@ struct npc_amberpine_woodsmanAI : public ScriptedAI
}
ScriptedAI::UpdateAI(uiDiff);
- if (!UpdateVictim())
- return;
+ UpdateVictim();
}
};