diff options
author | Shauren <none@none> | 2010-12-17 13:43:24 +0100 |
---|---|---|
committer | Shauren <none@none> | 2010-12-17 13:43:24 +0100 |
commit | 82f45966fc00106b52294e4c01a2848ba24e2eb8 (patch) | |
tree | dd3ee1457f54da1cdeebe3ded7e6e29f282d2bc9 /src/server/scripts/EasternKingdoms | |
parent | ee3fd3ebebcbf85d3ff942eb462b15368b76e8c1 (diff) |
Core/Unit: Renamed addUnitState/hasUnitState/clearUnitState to AddUnitState/HasUnitState/ClearUnitState
Core/Vehicles: Allow the vehicle to always damage the passenger (removed unneded dbc hacks from scripts)
--HG--
branch : trunk
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
4 files changed, 9 insertions, 9 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp index 0829e0d0e70..54e7a8d75df 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp @@ -342,7 +342,7 @@ public: //Teleport self to a hiding spot (this causes errors in the Trinity log but no real issues) DoTeleportTo(HIDE_X,HIDE_Y,HIDE_Z); - me->addUnitState(UNIT_STAT_FLEEING); + me->AddUnitState(UNIT_STAT_FLEEING); //Spawn nef and have him attack a random target Creature* Nefarian = me->SummonCreature(CREATURE_NEFARIAN,NEF_X,NEF_Y,NEF_Z,0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 84f8748d90a..9934878123f 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -393,7 +393,7 @@ public: EnfeebleResetTimer = 0; } else EnfeebleResetTimer -= diff; - if (me->hasUnitState(UNIT_STAT_STUNNED)) // While shifting to phase 2 malchezaar stuns himself + if (me->HasUnitState(UNIT_STAT_STUNNED)) // While shifting to phase 2 malchezaar stuns himself return; if (me->GetUInt64Value(UNIT_FIELD_TARGET) != me->getVictim()->GetGUID()) diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 9ba36803af7..1e7cbd118ad 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -425,7 +425,7 @@ public: { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); ScriptedAI::InitializeAI(); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 8bde996060b..ed0cddc92fc 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -151,7 +151,7 @@ public: summoned->CastSpell(summoned,SPELL_DARKFIEND_VISUAL,false); break; case CREATURE_DARKNESS: - summoned->addUnitState(UNIT_STAT_STUNNED); + summoned->AddUnitState(UNIT_STAT_STUNNED); float x,y,z,o; summoned->GetHomePosition(x,y,z,o); me->SummonCreature(CREATURE_DARK_FIENDS, x,y,z,o, TEMPSUMMON_CORPSE_DESPAWN, 0); @@ -401,7 +401,7 @@ public: InAction = false; SummonSentinel = false; - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); Summons.DespawnAll(); } @@ -475,7 +475,7 @@ public: WaitTimer = 2000; InAction = false; - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); } void SpellHit(Unit* /*caster*/, const SpellEntry* Spell) @@ -494,7 +494,7 @@ public: { if (!InAction) { - me->clearUnitState(UNIT_STAT_STUNNED); + me->ClearUnitState(UNIT_STAT_STUNNED); DoCastAOE(SPELL_DARKFIEND_SKIN, false); AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)); InAction = true; @@ -604,7 +604,7 @@ public: SpellTimer = 5000; Phase = 0; - me->addUnitState(UNIT_STAT_STUNNED); + me->AddUnitState(UNIT_STAT_STUNNED); DoCastAOE(SPELL_BLACKHOLE_SPAWN, true); } @@ -616,7 +616,7 @@ public: switch (NeedForAHack) { case 0: - me->clearUnitState(UNIT_STAT_STUNNED); + me->ClearUnitState(UNIT_STAT_STUNNED); DoCastAOE(SPELL_BLACKHOLE_GROW, false); if (Victim) AttackStart(Victim); |