diff options
| author | Malcrom <malcromdev@gmail.com> | 2013-07-09 18:27:03 -0230 |
|---|---|---|
| committer | Malcrom <malcromdev@gmail.com> | 2013-07-09 18:27:03 -0230 |
| commit | fb783fb0986e1944e3b0eb55f3426932594bca5c (patch) | |
| tree | 30452cc39095b9e2d5453bc8db69fd2ea626149c | |
| parent | 17398a4043bced0f086b23e63644e290690ee7d7 (diff) | |
Core/Scripting: A couple fixes for shattered Halls
| -rw-r--r-- | src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index 2f2e639d58a..4483618eace 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -353,7 +353,7 @@ class npc_fel_orc_convert : public CreatureScript events.Update(diff); - if (uint32 EVENT_HEMORRHAGE = events.ExecuteEvent()) + if (events.ExecuteEvent() == EVENT_HEMORRHAGE) { DoCastVictim(SPELL_HEMORRHAGE); events.ScheduleEvent(EVENT_HEMORRHAGE, 15000); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 4444c745275..9c32e459b9a 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -408,30 +408,23 @@ class npc_omrogg_heads : public CreatureScript instance = creature->GetInstanceScript(); } - void Reset() OVERRIDE - { - DeathYell = false; - } + void Reset() OVERRIDE { } - void EnterCombat(Unit* /*who*/) OVERRIDE {} + void EnterCombat(Unit* /*who*/) OVERRIDE { } void SetData(uint32 data, uint32 value) { if (data == SETDATA_DATA && value == SETDATA_YELL) { events.ScheduleEvent(EVENT_DEATH_YELL, 4000); - DeathYell = true; } } void UpdateAI(uint32 diff) OVERRIDE { - if (!DeathYell) - return; - events.Update(diff); - if (uint32 EVENT_DEATH_YELL = events.ExecuteEvent()) + if (events.ExecuteEvent() == EVENT_DEATH_YELL) { Talk(YELL_DIE_R); me->setDeathState(JUST_DIED); @@ -441,7 +434,6 @@ class npc_omrogg_heads : public CreatureScript private: InstanceScript* instance; EventMap events; - bool DeathYell; }; CreatureAI* GetAI(Creature* creature) const OVERRIDE |