aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Kalimdor
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/Kalimdor
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/Kalimdor')
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp4
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp12
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp2
-rw-r--r--src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp2
-rw-r--r--src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp2
5 files changed, 11 insertions, 11 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
index dbd0696631e..276b62c0689 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
@@ -490,7 +490,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3])
// Increment Enemy Count to be used in World States and instance script
++EnemyCount;
- pCreature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ pCreature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pCreature->setActive(true);
switch(entry)
{
@@ -1014,7 +1014,7 @@ void hyjalAI::WaypointReached(uint32 i)
if ((*itr) && (*itr)->isAlive() && (*itr) != me && (*itr)->GetEntry() != JAINA)
{
if (!(*itr)->IsWithinDist(me, 60))
- (*itr)->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ (*itr)->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
float x, y, z;
(*itr)->SetDefaultMovementType(IDLE_MOTION_TYPE);
(*itr)->GetMotionMaster()->Initialize();
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
index 4e340d13ea4..e2c3d9cde78 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
@@ -485,11 +485,11 @@ struct npc_arthasAI : public npc_escortAI
break;
//After waypoint 0
case 1:
- me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
if (Unit* pUther = me->SummonCreature(NPC_UTHER,1794.357f,1272.183f,140.558f,1.37f,TEMPSUMMON_DEAD_DESPAWN,180000))
{
uiUtherGUID = pUther->GetGUID();
- pUther->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ pUther->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
pUther->GetMotionMaster()->MovePoint(0, 1897.018f, 1287.487f, 143.481f);
pUther->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID());
me->SetUInt64Value(UNIT_FIELD_TARGET, uiUtherGUID);
@@ -574,7 +574,7 @@ struct npc_arthasAI : public npc_escortAI
case 17:
if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID))
{
- pUther->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ pUther->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pUther->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f);
}
JumpToNextStep(1000);
@@ -583,7 +583,7 @@ struct npc_arthasAI : public npc_escortAI
if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID))
{
me->SetUInt64Value(UNIT_FIELD_TARGET, uiJainaGUID);
- pJaina->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ pJaina->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pJaina->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f);
}
JumpToNextStep(1000);
@@ -649,7 +649,7 @@ struct npc_arthasAI : public npc_escortAI
if (Creature* pCityman = Unit::GetCreature(*me, uiCitymenGUID[0]))
{
pCityman->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID());
- pCityman->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ pCityman->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pCityman->GetMotionMaster()->MovePoint(0, 2088.625f,1279.191f,140.743f);
}
JumpToNextStep(2000);
@@ -822,7 +822,7 @@ struct npc_arthasAI : public npc_escortAI
if (Unit* pBoss = me->SummonCreature(uiBossID,2232.19f,1331.933f,126.662f,3.15f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000))
{
uiBossGUID = pBoss->GetGUID();
- pBoss->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ pBoss->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
pBoss->GetMotionMaster()->MovePoint(0, 2194.110f,1332.00f,130.00f);
}
}
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index 400fca670e2..801e79cb958 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -301,7 +301,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI
SetRun();
break;
case 91:
- me->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
SetRun(false);
break;
case 93:
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
index 458a6f44501..8849d9ca83f 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -291,7 +291,7 @@ struct instance_zulfarrak : public ScriptedInstance
{
if (npc->isAlive())
{
- npc->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ npc->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
npc->GetMotionMaster()->MovePoint(1,x,y,z);
npc->SetHomePosition(x,y,z,o);
}
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
index 8de6f2628b9..bed8bafe096 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp
@@ -196,7 +196,7 @@ void initBlyCrewMember(ScriptedInstance* pInstance, uint32 entry,float x,float y
if (Creature* crew = pInstance->instance->GetCreature(pInstance->GetData64(entry)))
{
crew->SetReactState(REACT_AGGRESSIVE);
- crew->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
+ crew->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
crew->SetHomePosition(x,y,z,0);
crew->GetMotionMaster()->MovePoint(1,x,y,z);
crew->setFaction(FACTION_FREED);