diff options
Diffstat (limited to 'src/server/scripts/Northrend')
9 files changed, 36 insertions, 17 deletions
diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 3fa94370f6a..1ae2ca29064 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -72,8 +72,10 @@ struct boss_cyanigosa : public BossAI if (!UpdateVictim()) return; - scheduler.Update(diff, - std::bind(&BossAI::DoMeleeAttackIfReady, this)); + scheduler.Update(diff, [this] + { + DoMeleeAttackIfReady(); + }); } void ScheduleTasks() override diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 3d0d871ac27..59a18ef1f67 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -265,8 +265,10 @@ struct npc_erekem_guard : public ScriptedAI if (!UpdateVictim()) return; - scheduler.Update(diff, - std::bind(&ScriptedAI::DoMeleeAttackIfReady, this)); + scheduler.Update(diff, [this] + { + DoMeleeAttackIfReady(); + }); } void ScheduledTasks() diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index c162e65c498..faa9c08fbc3 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -193,8 +193,10 @@ struct boss_ichoron : public BossAI _isFrenzy = true; } - scheduler.Update(diff, - std::bind(&BossAI::DoMeleeAttackIfReady, this)); + scheduler.Update(diff, [this] + { + DoMeleeAttackIfReady(); + }); } void ScheduleTasks() override diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 4a7705bb984..aa3c2a49329 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -53,8 +53,10 @@ struct boss_lavanthor : public BossAI if (!UpdateVictim()) return; - scheduler.Update(diff, - std::bind(&BossAI::DoMeleeAttackIfReady, this)); + scheduler.Update(diff, [this] + { + DoMeleeAttackIfReady(); + }); } void ScheduleTasks() override diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index b8afac4505a..974360cda3a 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -61,8 +61,10 @@ struct boss_moragg : public BossAI if (!UpdateVictim()) return; - scheduler.Update(diff, - std::bind(&BossAI::DoMeleeAttackIfReady, this)); + scheduler.Update(diff, [this] + { + DoMeleeAttackIfReady(); + }); } void ScheduleTasks() override diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 65499d61b49..727f5a33072 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -128,8 +128,10 @@ struct boss_xevozz : public BossAI if (!UpdateVictim()) return; - scheduler.Update(diff, - std::bind(&BossAI::DoMeleeAttackIfReady, this)); + scheduler.Update(diff, [this] + { + DoMeleeAttackIfReady(); + }); } void ScheduleTasks() override diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 98425811c25..cd5f79f0861 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -116,8 +116,10 @@ struct boss_zuramat : public BossAI if (!UpdateVictim()) return; - scheduler.Update(diff, - std::bind(&BossAI::DoMeleeAttackIfReady, this)); + scheduler.Update(diff, [this] + { + DoMeleeAttackIfReady(); + }); } void ScheduleTasks() override diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 933114916cf..bc68f6b08d3 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -398,7 +398,10 @@ class instance_violet_hold : public InstanceMapScript DoUpdateWorldState(WORLD_STATE_VH_SHOW, 1); WaveCount = 1; - Scheduler.Async(std::bind(&instance_violet_hold_InstanceMapScript::AddWave, this)); + Scheduler.Async([this] + { + AddWave(); + }); for (uint8 i = 0; i < ActivationCrystalCount; ++i) if (GameObject* crystal = instance->GetGameObject(ActivationCrystalGUIDs[i])) diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 626042068f5..16553c78709 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -920,8 +920,10 @@ struct violet_hold_trashAI : public EscortAI if (!UpdateVictim()) return; - _scheduler.Update(diff, - std::bind(&EscortAI::DoMeleeAttackIfReady, this)); + _scheduler.Update(diff, [this] + { + DoMeleeAttackIfReady(); + }); } virtual void ScheduledTasks() { } |