diff options
Diffstat (limited to 'src')
10 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index 44d2b7d3a0a..1199f8d6827 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -56,7 +56,7 @@ LootStore LootTemplates_Skinning("skinning_loot_template", "creature s LootStore LootTemplates_Spell("spell_loot_template", "spell id (random item creating)", false); // Selects invalid loot items to be removed from group possible entries (before rolling) -struct LootGroupInvalidSelector : public std::unary_function<LootStoreItem*, bool> +struct LootGroupInvalidSelector { explicit LootGroupInvalidSelector(Loot const& loot, uint16 lootMode) : _loot(loot), _lootMode(lootMode) { } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 046512f011f..8391e0caab2 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -112,7 +112,7 @@ enum Spells SPELL_WAKING_NIGHTMARE_H = 67677 }; -class OrientationCheck : public std::unary_function<Unit*, bool> +class OrientationCheck { public: explicit OrientationCheck(Unit* _caster) : caster(_caster) { } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 2f06d6f0d09..63986a5f0aa 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -104,7 +104,7 @@ enum Actions ACTION_TALK_ENTER_ZONE = 2 }; -class BoneSpikeTargetSelector : public std::unary_function<Unit*, bool> +class BoneSpikeTargetSelector { public: BoneSpikeTargetSelector(UnitAI* ai) : _ai(ai) { } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index bd5b03adbee..fb235733500 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -366,7 +366,7 @@ enum Misc DATA_VILE = 45814622 }; -class NecroticPlagueTargetCheck : public std::unary_function<Unit*, bool> +class NecroticPlagueTargetCheck { public: NecroticPlagueTargetCheck(Unit const* obj, uint32 notAura1 = 0, uint32 notAura2 = 0) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 915ad51d7d9..5a3fdd2c114 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -157,7 +157,7 @@ enum Misc Position const ValithriaSpawnPos = {4210.813f, 2484.443f, 364.9558f, 0.01745329f}; -struct ManaVoidSelector : public std::unary_function<Unit*, bool> +struct ManaVoidSelector { explicit ManaVoidSelector(WorldObject const* source) : _source(source) { } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 293bd232bcc..75f51f3dba4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -169,7 +169,7 @@ class KelThuzadCharmedPlayerAI : public SimpleCharmedPlayerAI public: KelThuzadCharmedPlayerAI(Player* player) : SimpleCharmedPlayerAI(player) { } - struct CharmedPlayerTargetSelectPred : public std::unary_function<Unit*, bool> + struct CharmedPlayerTargetSelectPred { bool operator()(Unit const* target) const { @@ -198,7 +198,7 @@ class KelThuzadCharmedPlayerAI : public SimpleCharmedPlayerAI } }; -struct ManaUserTargetSelector : public std::unary_function<Unit*, bool> +struct ManaUserTargetSelector { bool operator()(Unit const* target) const { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 67257ca718d..cfb2a09aa0c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -72,7 +72,7 @@ enum Events const float WEB_WRAP_MOVE_SPEED = 20.0f; -struct WebTargetSelector : public std::unary_function<Unit*, bool> +struct WebTargetSelector { WebTargetSelector(Unit* maexxna) : _maexxna(maexxna) {} bool operator()(Unit const* target) const diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index bc0438d8843..58c7ab39f8a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -362,7 +362,7 @@ class spell_ulduar_rubble_summon : public SpellScriptLoader }; // predicate function to select non main tank target -class StoneGripTargetSelector : public std::unary_function<Unit*, bool> +class StoneGripTargetSelector { public: StoneGripTargetSelector(Creature* me, Unit const* victim) : _me(me), _victim(victim) { } diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 5d16f56b83f..b0343090ba7 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -450,7 +450,7 @@ private: Unit* _owner; }; -class ChargeTargetSelector : public std::unary_function<Unit*, bool> +class ChargeTargetSelector { public: ChargeTargetSelector() { } diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index d7d85a05728..bf7da60b13e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -295,7 +295,7 @@ private: uint32 _bossId; }; -class HammerTargetSelector : public std::unary_function<Unit*, bool> +class HammerTargetSelector { public: HammerTargetSelector(Unit const* unit) : _me(unit) { } |