diff options
Diffstat (limited to 'src')
10 files changed, 59 insertions, 50 deletions
diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index 0a06d5ab091..48971ffa64a 100755 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -57,6 +57,7 @@ class _SpellScript protected: virtual bool _Validate(SpellEntry const * entry); public: + virtual ~_SpellScript() {} virtual void _Register(); virtual void _Unload(); virtual void _Init(const std::string * scriptname, uint32 spellId); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index ce63835641b..adf51f7fb1c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -268,6 +268,7 @@ class boss_blood_council_controller : public CreatureScript if (Creature* prince = ObjectAccessor::GetCreature(*me, invocationOrder[invocationStage].guid)) prince->Kill(prince); } + instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_SHADOW_PRISON_DUMMY); } void UpdateAI(const uint32 diff) @@ -715,8 +716,8 @@ class boss_prince_taldaram_icc : public CreatureScript } private: - bool isEmpowered; // bool check faster than map lookup uint32 spawnHealth; + bool isEmpowered; // bool check faster than map lookup }; CreatureAI* GetAI(Creature* creature) const @@ -933,8 +934,8 @@ class boss_prince_valanar_icc : public CreatureScript } private: - bool isEmpowered; // bool check faster than map lookup uint32 spawnHealth; + bool isEmpowered; // bool check faster than map lookup }; CreatureAI* GetAI(Creature* creature) const @@ -1033,9 +1034,9 @@ class npc_blood_queen_lana_thel : public CreatureScript } private: - bool introDone; EventMap events; InstanceScript* instance; + bool introDone; }; CreatureAI* GetAI(Creature* creature) const @@ -1109,8 +1110,8 @@ class npc_ball_of_flame : public CreatureScript } private: - uint32 despawnTimer; uint64 chaseGUID; + uint32 despawnTimer; }; CreatureAI* GetAI(Creature* creature) const @@ -1294,7 +1295,7 @@ class spell_taldaram_glittering_sparks : public SpellScriptLoader void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - GetCaster()->CastSpell(GetCaster(), GetEffectValue(), true); + GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } void Register() @@ -1321,7 +1322,7 @@ class spell_taldaram_summon_flame_ball : public SpellScriptLoader void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - GetCaster()->CastSpell(GetCaster(), GetEffectValue(), true); + GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); } void Register() @@ -1397,7 +1398,7 @@ class spell_taldaram_ball_of_inferno_flame : public SpellScriptLoader void ModAuraStack() { if (Aura* aur = GetHitAura()) - aur->SetStackAmount(GetSpellInfo()->StackAmount); + aur->SetStackAmount(uint8(GetSpellInfo()->StackAmount)); } void Register() diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index 154b814f3bb..fc488f2d5ea 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -167,7 +167,7 @@ class boss_blood_queen_lana_thel : public CreatureScript events.ScheduleEvent(EVENT_PACT_OF_THE_DARKFALLEN, 15000, EVENT_GROUP_NORMAL); events.ScheduleEvent(EVENT_SWARMING_SHADOWS, 30500, EVENT_GROUP_NORMAL); events.ScheduleEvent(EVENT_TWILIGHT_BLOODBOLT, urand(20000, 25000), EVENT_GROUP_NORMAL); - events.ScheduleEvent(EVENT_AIR_PHASE, 124000 + (Is25ManRaid() ? 3000 : 0)); + events.ScheduleEvent(EVENT_AIR_PHASE, 124000 + uint32(Is25ManRaid() ? 3000 : 0)); me->SetSpeed(MOVE_FLIGHT, 0.642857f, true); offtank = NULL; vampires.clear(); @@ -227,7 +227,7 @@ class boss_blood_queen_lana_thel : public CreatureScript { case POINT_CENTER: DoCast(me, SPELL_INCITE_TERROR); - events.ScheduleEvent(EVENT_AIR_PHASE, 100000 + (Is25ManRaid() ? 0 : 20000)); + events.ScheduleEvent(EVENT_AIR_PHASE, 100000 + uint32(Is25ManRaid() ? 0 : 20000)); events.RescheduleEvent(EVENT_SWARMING_SHADOWS, 30500, EVENT_GROUP_NORMAL); events.RescheduleEvent(EVENT_PACT_OF_THE_DARKFALLEN, 25500, EVENT_GROUP_NORMAL); events.ScheduleEvent(EVENT_AIR_START_FLYING, 5000); @@ -335,7 +335,7 @@ class boss_blood_queen_lana_thel : public CreatureScript { std::list<Player*> targets; SelectRandomTarget(false, &targets); - Trinity::RandomResizeList<Player*>(targets, Is25ManRaid() ? 4 : 2); + Trinity::RandomResizeList<Player*>(targets, uint32(Is25ManRaid() ? 4 : 2)); for (std::list<Player*>::iterator itr = targets.begin(); itr != targets.end(); ++itr) DoCast(*itr, SPELL_TWILIGHT_BLOODBOLT); DoCast(me, SPELL_TWILIGHT_BLOODBOLT_TARGET); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 0e33bf0b624..38f7811a1d1 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -426,10 +426,10 @@ class boss_deathbringer_saurfang : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); break; case EVENT_SUMMON_BLOOD_BEAST: - for (uint8 i10 = 0; i10 < 2; ++i10) + for (uint32 i10 = 0; i10 < 2; ++i10) DoCast(me, SPELL_SUMMON_BLOOD_BEAST+i10); if (Is25ManRaid()) - for (uint8 i25 = 0; i25 < 3; ++i25) + for (uint32 i25 = 0; i25 < 3; ++i25) DoCast(me, SPELL_SUMMON_BLOOD_BEAST_25_MAN+i25); Talk(SAY_BLOOD_BEASTS); events.ScheduleEvent(EVENT_SUMMON_BLOOD_BEAST, 40000, 0, PHASE_COMBAT); @@ -524,9 +524,9 @@ class boss_deathbringer_saurfang : public CreatureScript } private: + uint32 fallenChampionCount; bool introDone; bool frenzy; // faster than iterating all auras to find Frenzy - uint32 fallenChampionCount; }; CreatureAI* GetAI(Creature* creature) const @@ -1016,7 +1016,7 @@ class spell_deathbringer_blood_power : public SpellScriptLoader void RecalculateHook(AuraEffect const* /*aurEffect*/, int32& amount, bool& canBeRecalculated) { - amount = GetUnitOwner()->GetPower(POWER_ENERGY); + amount = int32(GetUnitOwner()->GetPower(POWER_ENERGY)); canBeRecalculated = true; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index dfc3ab27be1..6f532b10e77 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -210,7 +210,7 @@ class boss_festergut : public CreatureScript case EVENT_VILE_GAS: { std::list<Unit*> targets; - uint32 minTargets = RAID_MODE(3,8,3,8); + uint32 minTargets = RAID_MODE<uint32>(3,8,3,8); SelectTargetList(targets, minTargets, SELECT_TARGET_RANDOM, -5.0f, true); float minDist = 0.0f; if (targets.size() >= minTargets) @@ -268,9 +268,9 @@ class boss_festergut : public CreatureScript } private: + uint64 gasDummyGUID; uint32 maxInoculatedStack; uint8 inhaleCounter; - uint64 gasDummyGUID; }; CreatureAI* GetAI(Creature* creature) const @@ -359,7 +359,7 @@ class spell_festergut_pungent_blight : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { - SpellEntry const* spellInfo = sSpellStore.LookupEntry(GetEffectValue()); + SpellEntry const* spellInfo = sSpellStore.LookupEntry(uint32(GetEffectValue())); if (!spellInfo || GetCaster()->GetTypeId() != TYPEID_UNIT) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index f607977340c..cdf8d39cf3f 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -167,7 +167,7 @@ class boss_lady_deathwhisper : public CreatureScript boss_lady_deathwhisperAI(Creature* creature) : BossAI(creature, DATA_LADY_DEATHWHISPER) { introDone = false; - dominateMindCount = RAID_MODE(0,1,1,3); + dominateMindCount = RAID_MODE<uint8>(0,1,1,3); } void InitializeAI() @@ -383,7 +383,7 @@ class boss_lady_deathwhisper : public CreatureScript for (uint8 i = 0; i < dominateMindCount; i++) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, -SPELL_DOMINATE_MIND_H)) DoCast(target, SPELL_DOMINATE_MIND_H); - events.ScheduleEvent(EVENT_DOMINATE_MIND_H, urand(18000, 22000)); + events.ScheduleEvent(EVENT_DOMINATE_MIND_H, urand(40000, 45000)); break; case EVENT_P1_SUMMON_WAVE: SummonWaveP1(); @@ -443,7 +443,7 @@ class boss_lady_deathwhisper : public CreatureScript void SummonWaveP1() { uint8 addIndex = addWaveCounter & 1; - uint8 addIndexOther = addIndex ^ 1; + uint8 addIndexOther = uint8(addIndex ^ 1); _SummonAdd(addEntries[addIndex], addSpawnPos[addIndex*3]); _SummonAdd(addEntries[addIndexOther], addSpawnPos[addIndex*3+1]); _SummonAdd(addEntries[addIndex], addSpawnPos[addIndex*3+2]); @@ -537,15 +537,15 @@ class boss_lady_deathwhisper : public CreatureScript Creature* cultist = *cultistItr; DoCast(cultist, cultist->GetEntry() == NPC_CULT_FANATIC ? SPELL_DARK_TRANSFORMATION_T : SPELL_DARK_EMPOWERMENT_T, true); - Talk(cultist->GetEntry() == NPC_CULT_FANATIC ? SAY_DARK_TRANSFORMATION : SAY_DARK_EMPOWERMENT); + Talk(uint8(cultist->GetEntry() == NPC_CULT_FANATIC ? SAY_DARK_TRANSFORMATION : SAY_DARK_EMPOWERMENT)); } private: - bool introDone; - uint32 addWaveCounter; uint64 nextVengefulShadeTarget; std::deque<uint64> reanimationQueue; + uint32 addWaveCounter; uint8 dominateMindCount; + bool introDone; }; CreatureAI* GetAI(Creature* creature) const @@ -770,7 +770,7 @@ class spell_deathwhisper_mana_barrier : public SpellScriptLoader { PreventDefaultAction(); Unit* caster = GetCaster(); - int32 missingHealth = caster->GetMaxHealth() - caster->GetHealth(); + int32 missingHealth = int32(caster->GetMaxHealth() - caster->GetHealth()); caster->ModifyHealth(missingHealth); caster->ModifyPower(POWER_MANA, -missingHealth); } @@ -804,7 +804,7 @@ class spell_cultist_dark_martyrdom : public SpellScriptLoader CAST_AI(boss_lady_deathwhisper::boss_lady_deathwhisperAI, owner->ToCreature()->AI())->AddToReanimationQueue(GetCaster()); GetCaster()->Kill(GetCaster()); - GetCaster()->SetDisplayId(GetCaster()->GetEntry() == NPC_CULT_FANATIC ? 38009 : 38010); + GetCaster()->SetDisplayId(uint32(GetCaster()->GetEntry() == NPC_CULT_FANATIC ? 38009 : 38010)); } void Register() diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 51cffb4442d..78a3e2f44a4 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -45,13 +45,14 @@ enum eSpells SPELL_COLDFLAME_BONE_STORM = 72705, // Bone Spike - SPELL_IMPALE = 69062, SPELL_IMPALED = 69065, // Coldflame SPELL_COLDFLAME_PASSIVE = 69145, }; +static const uint32 boneSpikeSummonId[3] = {69062, 72669, 72670}; + enum eEvents { EVENT_BONE_SPIKE_GRAVEYARD = 1, @@ -84,11 +85,11 @@ class boss_lord_marrowgar : public CreatureScript { boss_lord_marrowgarAI(Creature* creature) : BossAI(creature, DATA_LORD_MARROWGAR) { - introDone = false; - boneStormDuration = RAID_MODE(20000, 30000, 20000, 30000); + boneStormDuration = RAID_MODE<uint32>(20000, 30000, 20000, 30000); baseSpeed = creature->GetSpeedRate(MOVE_RUN); - boneSlice = false; coldflameLastPos.Relocate(creature); + introDone = false; + boneSlice = false; } void InitializeAI() @@ -182,6 +183,7 @@ class boss_lord_marrowgar : public CreatureScript DoCast(me, SPELL_BONE_STORM); events.DelayEvents(3000, EVENT_GROUP_SPECIAL); events.ScheduleEvent(EVENT_BONE_STORM_BEGIN, 3050); + events.ScheduleEvent(EVENT_WARN_BONE_STORM, urand(90000, 95000)); break; case EVENT_BONE_STORM_BEGIN: if (Aura* pStorm = me->GetAura(SPELL_BONE_STORM)) @@ -207,7 +209,8 @@ class boss_lord_marrowgar : public CreatureScript me->SetSpeed(MOVE_RUN, baseSpeed, true); events.CancelEvent(EVENT_BONE_STORM_MOVE); events.ScheduleEvent(EVENT_ENABLE_BONE_SLICE, 10000); - events.ScheduleEvent(EVENT_WARN_BONE_STORM, urand(70000, 75000)); + if (!IsHeroic()) + events.RescheduleEvent(EVENT_BONE_SPIKE_GRAVEYARD, urand(15000, 20000), EVENT_GROUP_SPECIAL); break; case EVENT_ENABLE_BONE_SLICE: boneSlice = true; @@ -245,11 +248,11 @@ class boss_lord_marrowgar : public CreatureScript } private: - bool introDone; uint32 boneStormDuration; float baseSpeed; - bool boneSlice; Position coldflameLastPos; + bool introDone; + bool boneSlice; }; CreatureAI* GetAI(Creature* creature) const @@ -282,12 +285,15 @@ class npc_coldflame : public CreatureScript if (!owner->HasAura(SPELL_BONE_STORM)) { // select any unit but not the tank (by owners threatlist) - Unit* target = creOwner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 1, 40.0f, true); + Unit* target = creOwner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 1, 40.0f, true, -SPELL_IMPALED); if (!target) target = creOwner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true); // or the tank if its solo if (!target) { - me->ForcedDespawn(); + if (TempSummon* summ = me->ToTempSummon()) + summ->UnSummon(); + else + me->ForcedDespawn(); return; } @@ -371,6 +377,8 @@ class npc_bone_spike : public CreatureScript { if (TempSummon* summ = me->ToTempSummon()) summ->UnSummon(); + victim->RemoveAurasDueToSpell(SPELL_IMPALED); + trappedGUID = 0; } void IsSummonedBy(Unit* summoner) @@ -423,7 +431,7 @@ class spell_marrowgar_coldflame : public SpellScriptLoader count = 4; for (uint8 i = 0; i < count; ++i) - caster->CastSpell(caster, GetEffectValue()+i, true); + caster->CastSpell(caster, uint32(GetEffectValue()+i), true); } void Register() @@ -454,7 +462,7 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader { CreatureAI* marrowgarAI = marrowgar->AI(); bool yell = false; - uint8 boneSpikeCount = GetCaster()->GetMap()->GetSpawnMode() & 1 ? 3 : 1; + uint8 boneSpikeCount = uint8(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 3 : 1); for (uint8 i = 0; i < boneSpikeCount; ++i) { // select any unit but not the tank @@ -464,7 +472,7 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader if (!target) break; yell = true; - target->CastCustomSpell(SPELL_IMPALE, SPELLVALUE_BASE_POINT0, 0, target, true); + target->CastCustomSpell(boneSpikeSummonId[i], SPELLVALUE_BASE_POINT0, 0, target, true); } if (yell) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index a38a499a109..690efd690de 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -658,10 +658,9 @@ class boss_professor_putricide : public CreatureScript events.SetPhase(newPhase); } + uint64 oozeFloodDummy[4]; ePhases phase; // external of EventMap because event phase gets reset on evade - // Festergut & Rotface variables const float baseSpeed; - uint64 oozeFloodDummy[4]; uint8 oozeFloodStage; bool experimentState; }; @@ -893,7 +892,7 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader break; } - GetCaster()->CastSpell(target, GetSpellInfo()->EffectBasePoints[stage]+1, true, NULL, NULL, GetCaster()->GetGUID()); + GetCaster()->CastSpell(target, uint32(GetSpellInfo()->EffectBasePoints[stage]+1), true, NULL, NULL, GetCaster()->GetGUID()); } void Register() @@ -993,7 +992,7 @@ class spell_putricide_choking_gas_bomb : public SpellScriptLoader if (i == skipIndex) continue; - uint32 spellId = SpellMgr::CalculateSpellEffectAmount(GetSpellInfo(), uint8(i)); + uint32 spellId = uint32(SpellMgr::CalculateSpellEffectAmount(GetSpellInfo(), uint8(i))); GetCaster()->CastSpell(GetCaster(), spellId, true, NULL, NULL, GetCaster()->GetGUID()); } } @@ -1079,7 +1078,7 @@ class spell_putricide_eat_ooze : public SpellScriptLoader { if (Creature* target = GetCaster()->FindNearestCreature(NPC_GROWING_OOZE_PUDDLE, 15.0f)) { - if (Aura* grow = target->GetAura(GetEffectValue())) + if (Aura* grow = target->GetAura(uint32(GetEffectValue()))) { if (grow->GetStackAmount() < 4) { @@ -1143,7 +1142,7 @@ class spell_putricide_mutated_plague : public SpellScriptLoader { if (aurApp->GetRemoveMode() == AURA_REMOVE_BY_STACK) return; - uint32 healSpell = SpellMgr::CalculateSpellEffectAmount(GetSpellProto(), 0); + uint32 healSpell = uint32(SpellMgr::CalculateSpellEffectAmount(GetSpellProto(), 0)); aurApp->GetTarget()->CastSpell(aurApp->GetTarget(), healSpell, true, NULL, NULL, GetCasterGUID()); } @@ -1229,13 +1228,13 @@ class spell_putricide_mutated_transformation : public SpellScriptLoader void HandleSummon(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - uint32 entry = GetSpellInfo()->EffectMiscValue[effIndex]; - SummonPropertiesEntry const* properties = sSummonPropertiesStore.LookupEntry(GetSpellInfo()->EffectMiscValueB[effIndex]); + uint32 entry = uint32(GetSpellInfo()->EffectMiscValue[effIndex]); + SummonPropertiesEntry const* properties = sSummonPropertiesStore.LookupEntry(uint32(GetSpellInfo()->EffectMiscValueB[effIndex])); Unit* caster = GetOriginalCaster(); if (!caster) return; - int32 duration = GetSpellDuration(GetSpellInfo()); + uint32 duration = uint32(GetSpellDuration(GetSpellInfo())); Position pos; caster->GetPosition(&pos); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 8351b1b0b5c..359b67232aa 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -228,8 +228,8 @@ class boss_rotface : public CreatureScript } private: - uint8 infectionStage; uint32 infectionCooldown; + uint8 infectionStage; }; CreatureAI* GetAI(Creature* creature) const @@ -468,7 +468,7 @@ class spell_rotface_ooze_flood : public SpellScriptLoader std::list<Creature*> list; GetHitUnit()->GetCreatureListWithEntryInGrid(list, GetHitUnit()->GetEntry(), 12.5f); list.sort(Trinity::ObjectDistanceOrderPred(GetHitUnit())); - GetHitUnit()->CastSpell(list.back(), GetEffectValue(), false, NULL, NULL, GetOriginalCaster() ? GetOriginalCaster()->GetGUID() : 0); + GetHitUnit()->CastSpell(list.back(), uint32(GetEffectValue()), false, NULL, NULL, GetOriginalCaster() ? GetOriginalCaster()->GetGUID() : 0); } void Register() @@ -580,7 +580,7 @@ class spell_rotface_large_ooze_buff_combine : public SpellScriptLoader if (Aura* unstable = GetCaster()->GetAura(SPELL_UNSTABLE_OOZE)) { - uint8 newStack = unstable->GetStackAmount()+1; + uint8 newStack = uint8(unstable->GetStackAmount()+1); unstable->SetStackAmount(newStack); // explode! diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp index dfca787c3cc..d5365fd1cc6 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp @@ -500,7 +500,6 @@ class instance_icecrown_citadel : public InstanceMapScript } private: - uint32 teamInInstance; uint64 ladyDeathwisperElevator; uint64 deathbringerSaurfang; uint64 saurfangDoor; @@ -517,6 +516,7 @@ class instance_icecrown_citadel : public InstanceMapScript uint64 bloodCouncil[3]; uint64 bloodCouncilController; uint64 bloodQueenLanaThel; + uint32 teamInInstance; bool isBonedEligible; bool isOozeDanceEligible; bool isNauseaEligible; |