diff options
Diffstat (limited to 'src')
5 files changed, 20 insertions, 16 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index a00ec330897..4a6c9c2a662 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -365,7 +365,7 @@ class boss_deathbringer_saurfang : public CreatureScript instance->HandleGameObject(instance->GetData64(GO_SAURFANG_S_DOOR), false); } - void SpellHitTarget(Unit* target, const SpellEntry* spell) + void SpellHitTarget(Unit* target, SpellEntry const* spell) { switch (spell->Id) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index c87a5242cac..dfc3ab27be1 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -110,7 +110,11 @@ class boss_festergut : public CreatureScript if (Creature* gasDummy = me->FindNearestCreature(NPC_GAS_DUMMY, 100.0f, true)) { gasDummyGUID = gasDummy->GetGUID(); - _RemoveBlight(); + for (uint8 i = 0; i < 3; ++i) + { + gasDummy->RemoveAurasDueToSpell(gaseousBlight[i]); + gasDummy->RemoveAurasDueToSpell(gaseousBlightVisual[i]); + } } instance->SetBossState(DATA_FESTERGUT, NOT_STARTED); @@ -160,7 +164,7 @@ class boss_festergut : public CreatureScript // don't enter combat } - void SpellHitTarget(Unit* target, const SpellEntry* spell) + void SpellHitTarget(Unit* target, SpellEntry const* spell) { if (spell->Id == PUNGENT_BLIGHT_HELPER) target->RemoveAurasDueToSpell(INOCULATED_HELPER); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index cc303407873..22db942a7cf 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -257,7 +257,7 @@ class boss_lady_deathwhisper : public CreatureScript if (livingAddEntries.size() >= 5) { - if (Player *player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) + if (Player* player = killer->GetCharmerOrOwnerPlayerOrPlayerItself()) { if (Group* group = player->GetGroup()) { @@ -499,7 +499,7 @@ class boss_lady_deathwhisper : public CreatureScript DoCast(cultist, SPELL_DARK_MARTYRDOM_T); } - void SpellHitTarget(Unit* target, const SpellEntry* spell) + void SpellHitTarget(Unit* target, SpellEntry const* spell) { if (spell->Id == SPELL_DARK_MARTYRDOM_T) { @@ -572,7 +572,7 @@ class npc_cult_fanatic : public CreatureScript events.ScheduleEvent(EVENT_CULTIST_DARK_MARTYRDOM, urand(18000, 32000)); } - void SpellHit(Unit* /*caster*/, const SpellEntry* spell) + void SpellHit(Unit* /*caster*/, SpellEntry const* spell) { if (spell->Id == SPELL_DARK_TRANSFORMATION) me->UpdateEntry(NPC_DEFORMED_FANATIC); @@ -650,7 +650,7 @@ class npc_cult_adherent : public CreatureScript events.ScheduleEvent(EVENT_CULTIST_DARK_MARTYRDOM, urand(18000, 32000)); } - void SpellHit(Unit* /*caster*/, const SpellEntry* spell) + void SpellHit(Unit* /*caster*/, SpellEntry const* spell) { if (spell->Id == SPELL_DARK_EMPOWERMENT) me->UpdateEntry(NPC_EMPOWERED_ADHERENT); @@ -734,7 +734,7 @@ class npc_vengeful_shade : public CreatureScript me->AddAura(SPELL_VENGEFUL_BLAST_PASSIVE, me); } - void SpellHitTarget(Unit* /*pTarget*/, const SpellEntry* spell) + void SpellHitTarget(Unit* /*target*/, SpellEntry const* spell) { switch (spell->Id) { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 3976da68cce..bf079cfc757 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -686,7 +686,7 @@ class npc_volatile_ooze : public CreatureScript newTargetSelectTimer = 0; } - void SpellHitTarget(Unit* /*pTarget*/, const SpellEntry* spell) + void SpellHitTarget(Unit* /*target*/, SpellEntry const* spell) { SpellEntry const* explode = sSpellStore.LookupEntry(SPELL_OOZE_ERUPTION); explode = sSpellMgr.GetSpellForDifficultyFromSpell(explode, me); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp index 04a16bf6440..11a1e4b8942 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel_teleport.cpp @@ -42,19 +42,19 @@ class icecrown_citadel_teleport : public GameObjectScript bool OnGossipHello(Player* player, GameObject* go) { player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport to Light's Hammer.", GOSSIP_SENDER_ICC_PORT, LIGHT_S_HAMMER_TELEPORT); - if (InstanceScript* pInstance = go->GetInstanceScript()) + if (InstanceScript* instance = go->GetInstanceScript()) { - if (pInstance->GetBossState(DATA_LORD_MARROWGAR) == DONE) + if (instance->GetBossState(DATA_LORD_MARROWGAR) == DONE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport to the Oratory of the Damned.", GOSSIP_SENDER_ICC_PORT, ORATORY_OF_THE_DAMNED_TELEPORT); - if (pInstance->GetBossState(DATA_LADY_DEATHWHISPER) == DONE) + if (instance->GetBossState(DATA_LADY_DEATHWHISPER) == DONE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport to the Rampart of Skulls.", GOSSIP_SENDER_ICC_PORT, RAMPART_OF_SKULLS_TELEPORT); - if (pInstance->GetBossState(DATA_GUNSHIP_EVENT) == DONE) + if (instance->GetBossState(DATA_GUNSHIP_EVENT) == DONE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport to the Deathbringer's Rise.", GOSSIP_SENDER_ICC_PORT, DEATHBRINGER_S_RISE_TELEPORT); - if (pInstance->GetBossState(DATA_DEATHBRINGER_SAURFANG) == DONE) + if (instance->GetBossState(DATA_DEATHBRINGER_SAURFANG) == DONE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport to the Upper Spire.", GOSSIP_SENDER_ICC_PORT, UPPER_SPIRE_TELEPORT); - if (pInstance->GetBossState(DATA_VALITHRIA_DREAMWALKER) == DONE) + if (instance->GetBossState(DATA_VALITHRIA_DREAMWALKER) == DONE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport to the Sindragosa's Lair", GOSSIP_SENDER_ICC_PORT, SINDRAGOSA_S_LAIR_TELEPORT); - if (pInstance->GetBossState(DATA_PROFESSOR_PUTRICIDE) == DONE && pInstance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) == DONE && pInstance->GetBossState(DATA_SINDRAGOSA) == DONE) + if (instance->GetBossState(DATA_PROFESSOR_PUTRICIDE) == DONE && instance->GetBossState(DATA_BLOOD_QUEEN_LANA_THEL) == DONE && instance->GetBossState(DATA_SINDRAGOSA) == DONE) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport to The Frozen Throne", GOSSIP_SENDER_ICC_PORT, FROZEN_THRONE_TELEPORT); } |