aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Outland
diff options
context:
space:
mode:
authorVenugh <venugh@gmx.net>2012-02-23 12:32:21 +0100
committerVenugh <venugh@gmx.net>2012-02-23 12:32:21 +0100
commit5416b734e4c044cfea4e78f9f34ecf237c693265 (patch)
tree3df893f0a51c947142d0e16381c9fe9ddfe6d7bb /src/server/scripts/Outland
parent02525acccba3a206ceed5573e619a28f452b7921 (diff)
Core/Movement: Use SetLevitate(true/false) instead of AddUnit/RemoveUnit.
Diffstat (limited to 'src/server/scripts/Outland')
-rw-r--r--src/server/scripts/Outland/BlackTemple/boss_illidan.cpp4
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp2
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp4
-rw-r--r--src/server/scripts/Outland/shadowmoon_valley.cpp8
4 files changed, 9 insertions, 9 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index c0c18b082bf..b0a42614ee3 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -867,7 +867,7 @@ public:
Timer[EVENT_FLIGHT_SEQUENCE] = 2000;
break;
case 9: // land
- me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+ me->SetLevitate(false);
me->StopMoving();
me->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
for (uint8 i = 0; i < 2; ++i)
@@ -1869,7 +1869,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::Reset()
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
SetEquipmentSlots(false, EQUIP_UNEQUIP, EQUIP_UNEQUIP, EQUIP_NO_CHANGE);
- me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+ me->SetLevitate(false);
me->setActive(false);
Summons.DespawnAll();
}
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 0ec8addd9f1..2db259744df 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -779,7 +779,7 @@ public:
void Reset()
{
- me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+ me->SetLevitate(true);
me->setFaction(14);
movement_timer = 0;
ToxicSpore_Timer = 5000;
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index 2e2ea1b7936..4f422da35ad 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -145,7 +145,7 @@ class boss_nazan : public CreatureScript
flight = false;
BellowingRoar_Timer = 6000;
ConeOfFire_Timer = 12000;
- me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+ me->SetLevitate(false);
me->SetWalk(true);
me->GetMotionMaster()->Clear();
if (Unit* victim = SelectTarget(SELECT_TARGET_NEAREST, 0))
@@ -374,7 +374,7 @@ class boss_vazruden_the_herald : public CreatureScript
if (summoned->GetEntry() == ENTRY_NAZAN)
{
CAST_AI(boss_nazan::boss_nazanAI, summoned->AI())->VazrudenGUID = VazrudenGUID;
- summoned->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+ summoned->SetLevitate(true);
summoned->SetSpeed(MOVE_FLIGHT, 2.5f);
if (victim)
AttackStartNoMove(victim);
diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/shadowmoon_valley.cpp
index 7a50fb8cda2..6acd9bf6c99 100644
--- a/src/server/scripts/Outland/shadowmoon_valley.cpp
+++ b/src/server/scripts/Outland/shadowmoon_valley.cpp
@@ -224,7 +224,7 @@ public:
me->setFaction(FACTION_DEFAULT);
FlyTimer = 10000;
- me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+ me->SetLevitate(false);
me->SetVisible(true);
}
@@ -271,7 +271,7 @@ public:
PlayerGUID = 0;
}
me->SetVisible(false);
- me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+ me->SetLevitate(false);
me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
me->RemoveCorpse();
}
@@ -309,7 +309,7 @@ public:
pos.m_positionZ += 25;
}
- me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+ me->SetLevitate(true);
me->GetMotionMaster()->MovePoint(1, pos);
}
}
@@ -815,7 +815,7 @@ public:
case 19: DoScriptText(LORD_ILLIDAN_SAY_7, Illi); return 5000; break;
case 20:
Illi->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
- Illi->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
+ Illi->SetLevitate(true);
return 500; break;
case 21: DoScriptText(OVERLORD_SAY_5, me); return 500; break;
case 22: