diff options
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
5 files changed, 11 insertions, 12 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 7355674963a..58ebef77425 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -412,7 +412,7 @@ class npc_eye_of_acherus : public CreatureScript { if (movementType == WAYPOINT_MOTION_TYPE && pointId == POINT_EYE_MOVE_END - 1) { - me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); + me->SetByteValue(UNIT_FIELD_BYTES_2, 0, SHEATH_STATE_MELEE); me->RemoveAllAuras(); if (Player* owner = me->GetCharmerOrOwner()->ToPlayer()) diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index 44885a01270..b218e3f2978 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -105,7 +105,7 @@ public: DoMeleeAttackIfReady(); } - + private: EventMap events; SummonList Summons; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index 82a8e4e656d..0594fbf63b3 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -151,18 +151,17 @@ class spell_kormok_summon_bone_mages : SpellScriptLoader bool Validate(SpellInfo const* /*spell*/) override { - for (int i = 0; i < 4; ++i) + for (uint32 i = 0; i < 4; ++i) if (!sSpellMgr->GetSpellInfo(SummonMageSpells[i])) return false; - - return true; + return true; } void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - for (int i = 0; i < 2; ++i) - GetCaster()->CastSpell(GetCaster(), SummonMageSpells[urand(0, 4)], true); + for (uint32 i = 0; i < 2; ++i) + GetCaster()->CastSpell(GetCaster(), SummonMageSpells[urand(0, 4)], true); } void Register() override @@ -199,7 +198,7 @@ class spell_kormok_summon_bone_minions : SpellScriptLoader PreventHitDefaultEffect(effIndex); // Possible spells to handle this not found. - for (int i = 0; i < 4; ++i) + for (uint32 i = 0; i < 4; ++i) GetCaster()->SummonCreature(NPC_BONE_MINION, GetCaster()->GetPositionX() + float(irand(-7, 7)), GetCaster()->GetPositionY() + float(irand(-7, 7)), GetCaster()->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index 41873d778ca..897799a708c 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -53,8 +53,8 @@ public: DoCast(me, SPELL_ICE_ARMOR); } - void EnterCombat(Unit* /*who*/) override - { + void EnterCombat(Unit* /*who*/) override + { events.ScheduleEvent(EVENT_ICE_ARMOR, 2000); events.ScheduleEvent(EVENT_FROSTBOLT, 8000); events.ScheduleEvent(EVENT_CHILL_NOVA, 12000); @@ -108,7 +108,7 @@ public: DoMeleeAttackIfReady(); } - + private: EventMap events; }; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp index 654f06ad3ed..792649f2998 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp @@ -101,7 +101,7 @@ public: DoMeleeAttackIfReady(); } - + private: EventMap events; }; |