aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorQAston <none@none>2010-08-04 14:39:45 +0200
committerQAston <none@none>2010-08-04 14:39:45 +0200
commit6353e7dd8cd189a80fc6773bf653f159fc3a41d3 (patch)
tree841ca8df929325ef8338c62f3b6c3b06cb06df5c /src/server/scripts/Northrend
parent850868c8a33550b60ad1ae0c92f7985409d17bdc (diff)
*Update movement enums - thanks to Zor for info.
*Add functions for position data streaming. --HG-- branch : trunk
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp2
-rw-r--r--src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp2
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp2
-rw-r--r--src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp4
-rw-r--r--src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp4
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp2
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp2
-rw-r--r--src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp6
-rw-r--r--src/server/scripts/Northrend/VioletHold/violet_hold.cpp2
-rw-r--r--src/server/scripts/Northrend/borean_tundra.cpp12
-rw-r--r--src/server/scripts/Northrend/grizzly_hills.cpp2
-rw-r--r--src/server/scripts/Northrend/howling_fjord.cpp2
-rw-r--r--src/server/scripts/Northrend/zuldrak.cpp2
13 files changed, 22 insertions, 22 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
index 3ea1c0bda4f..9fae4369acb 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp
@@ -192,7 +192,7 @@ struct boss_jedoga_shadowseekerAI : public ScriptedAI
/* me->SetUnitMovementFlags(MOVEMENTFLAG_JUMPING);
me->SendMonsterMove(JedogaPosition[1], MOVEFLAG_JUMP, 0);
me->Relocate(JedogaPosition[1][0], JedogaPosition[1][1], JedogaPosition[1][2], JedogaPosition[1][3]);
- me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
+ me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
*/
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, false);
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, false);
diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
index 995fccd8611..643d4fee1c5 100644
--- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp
@@ -312,7 +312,7 @@ struct boss_taldaramAI : public ScriptedAI
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->RemoveAurasDueToSpell(SPELL_BEAM_VISUAL);
- me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
+ me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), DATA_GROUND_POSITION_Z, me->GetOrientation());
uint64 prison_GUID = pInstance->GetData64(DATA_PRINCE_TALDARAM_PLATFORM);
pInstance->HandleGameObject(prison_GUID,true);
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index d04180aa037..0313f9eb893 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -184,7 +184,7 @@ struct boss_four_horsemenAI : public BossAI
{
movementStarted = true;
me->SetReactState(REACT_PASSIVE);
- me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->SetSpeed(MOVE_RUN, me->GetSpeedRate(MOVE_RUN), true);
switch(id)
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
index 4333102c540..86735b9ff81 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp
@@ -269,7 +269,7 @@ struct boss_uromAI : public ScriptedAI
me->NearTeleportTo(pPos.GetPositionX(),pPos.GetPositionY(),pPos.GetPositionZ(),pPos.GetOrientation());
me->GetMotionMaster()->MoveChase(me->getVictim(),0,0);
- me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
+ me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
bCanCast = false;
bCanGoBack = false;
@@ -332,7 +332,7 @@ struct boss_uromAI : public ScriptedAI
LeaveCombat();
break;
case SPELL_TELEPORT:
- me->AddUnitMovementFlag(MOVEMENTFLAG_FLY_MODE); // with out it the npc will fall down while is casting
+ me->AddUnitMovementFlag(MOVEMENTFLAG_CAN_FLY); // with out it the npc will fall down while is casting
bCanCast = true;
break;
default:
diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
index 53abe6fbb2c..971f60fe435 100644
--- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
@@ -480,8 +480,8 @@ struct boss_sartharionAI : public ScriptedAI
{
if (pTemp->isAlive() && !pTemp->getVictim())
{
- if (pTemp->HasUnitMovementFlag(MOVEMENTFLAG_WALK_MODE))
- pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ if (pTemp->HasUnitMovementFlag(MOVEMENTFLAG_WALKING))
+ pTemp->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
if (pTemp->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
index 31274403c0e..8e0b69a1d3c 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
@@ -199,7 +199,7 @@ struct boss_kelesethAI : public ScriptedAI
Skeleton = me->SummonCreature(CREATURE_SKELETON, SkeletonSpawnPoint[i][0], SkeletonSpawnPoint[i][1] , SKELETONSPAWN_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000);
if (Skeleton)
{
- Skeleton->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ Skeleton->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
Skeleton->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY() , me->GetPositionZ());
Skeleton->AddThreat(me->getVictim(), 0.0f);
DoZoneInCombat(Skeleton);
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
index 59d6baeded7..cd85de0dfcd 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
@@ -230,7 +230,7 @@ struct boss_skadiAI : public ScriptedAI
m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS_EVENT, IN_PROGRESS);
m_pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT);
me->GetMotionMaster()->MoveJump(Location[0].GetPositionX(), Location[0].GetPositionY(), Location[0].GetPositionZ(), 5.0f, 10.0f);
- me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
m_uiMountTimer = 1000;
Summons.DespawnEntry(CREATURE_GRAUF);
}
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
index bd3cf42c502..2a785d70f39 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
@@ -254,7 +254,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
Phase = NORMAL;
DoTeleportTo(296.632, -346.075, 90.6307);
- me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
+ me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
summons.DespawnAll();
@@ -315,7 +315,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
DoCast(pSacrificeTarget, SPELL_RITUAL_OF_THE_SWORD);
//Spell doesn't teleport
DoTeleportPlayer(pSacrificeTarget, 296.632, -346.075, 90.63, 4.6);
- me->SetUnitMovementFlags(MOVEMENTFLAG_FLY_MODE);
+ me->SetUnitMovementFlags(MOVEMENTFLAG_CAN_FLY);
DoTeleportTo(296.632, -346.075, 120.85);
Phase = SACRIFICING;
if (pInstance)
@@ -344,7 +344,7 @@ struct boss_svala_sorrowgraveAI : public ScriptedAI
//go down
Phase = NORMAL;
pSacrificeTarget = NULL;
- me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
+ me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
me->GetMotionMaster()->MoveChase(pTarget);
diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
index 1267ede8be6..47d649b9e9b 100644
--- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp
@@ -308,7 +308,7 @@ struct npc_sinclariAI : public ScriptedAI
{
if (Creature* pGuard = *itr)
{
- pGuard->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ pGuard->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pGuard->GetMotionMaster()->MovePoint(0, MovePosition);
}
}
diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp
index b71c03eedf2..4b16a3298bc 100644
--- a/src/server/scripts/Northrend/borean_tundra.cpp
+++ b/src/server/scripts/Northrend/borean_tundra.cpp
@@ -945,16 +945,16 @@ struct npc_thassarianAI : public npc_escortAI
uiArthas = pArthas->GetGUID();
pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pArthas->SetReactState(REACT_PASSIVE);
- pArthas->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ pArthas->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pArthas->GetMotionMaster()->MovePoint(0, 3737.374756,3564.841309,477.433014);
}
if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23, 3614.936, 473.321, 4.462012, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000))
{
uiTalbot = pTalbot->GetGUID();
- pTalbot->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ pTalbot->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977,3568.882080,477.433014);
}
- me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
break;
case 4:
@@ -1033,13 +1033,13 @@ struct npc_thassarianAI : public npc_escortAI
if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100, 3615.655029, 473.321533, 4.447805, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000))
{
uiArlos = pArlos->GetGUID();
- pArlos->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ pArlos->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pArlos->GetMotionMaster()->MovePoint(0, 3735.570068, 3572.419922, 477.441010);
}
if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541, 3614.959717, 473.323486, 4.524959, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000))
{
uiLeryssa = pLeryssa->GetGUID();
- pLeryssa->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ pLeryssa->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pLeryssa->SetReactState(REACT_PASSIVE);
pLeryssa->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
pLeryssa->GetMotionMaster()->MovePoint(0, 3741.969971, 3571.439941, 477.441010);
@@ -1342,7 +1342,7 @@ struct npc_counselor_talbotAI : public ScriptedAI
pArlos->Kill(pArlos, false);
pLeryssa->RemoveAura(SPELL_STUN);
pLeryssa->clearUnitState(UNIT_STAT_STUNNED);
- pLeryssa->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ pLeryssa->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pLeryssa->GetMotionMaster()->MovePoint(0,3722.114502, 3564.201660, 477.441437);
if (pKiller->GetTypeId() == TYPEID_PLAYER)
diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp
index bb0971c8904..6f4028c5110 100644
--- a/src/server/scripts/Northrend/grizzly_hills.cpp
+++ b/src/server/scripts/Northrend/grizzly_hills.cpp
@@ -256,7 +256,7 @@ struct npc_emilyAI : public npc_escortAI
pPlayer->GroupEventHappens(QUEST_PERILOUS_ADVENTURE, me);
DoScriptText(SAY_QUEST_COMPLETE, me, pPlayer);
}
- me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
break;
case 25:
DoScriptText(SAY_VICTORY4, me);
diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp
index 7b2fb06986e..f72f8f861f0 100644
--- a/src/server/scripts/Northrend/howling_fjord.cpp
+++ b/src/server/scripts/Northrend/howling_fjord.cpp
@@ -174,7 +174,7 @@ struct npc_plaguehound_trackerAI : public npc_escortAI
if (!pPlayer)
return;
- me->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
+ me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING);
Start(false, false, pPlayer->GetGUID());
}
diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp
index 2b0917922e2..029d3fc7640 100644
--- a/src/server/scripts/Northrend/zuldrak.cpp
+++ b/src/server/scripts/Northrend/zuldrak.cpp
@@ -1249,7 +1249,7 @@ struct npc_crusade_recruitAI : public ScriptedAI
break;
case 2:
// walk forward
- me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->GetMotionMaster()->MovePoint(0,me->GetPositionX() + (cos(m_heading) * 10), me->GetPositionY() + (sin(m_heading) * 10), me->GetPositionZ());
m_uiTimer = 5000;
m_uiPhase = 3;