nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-25 22:56:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core): enable C++17 (#2234)

Browse Source 
Co-authored-by: Winfidonarleyan <dowlandtop@yandex.com>
This commit is contained in:
Francesco Borzì
2019-09-02 08:54:10 +02:00
committed by Kargatum
parent cae91f1650
commit 3a43e8c415
28 changed files with 61 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/game/AI/CoreAI/UnitAI.h
View File

@@ -28,7 +28,7 @@ enum SelectAggroTarget
};
// default predicate function to select target based on distance, player and/or aura criteria
struct DefaultTargetSelector : public std::unary_function<Unit*, bool>
struct DefaultTargetSelector : public ACORE::unary_function<Unit*, bool>
{
const Unit* me;
float m_dist;
@@ -78,7 +78,7 @@ struct DefaultTargetSelector : public std::unary_function<Unit*, bool>
// Target selector for spell casts checking range, auras and attributes
// TODO: Add more checks from Spell::CheckCast
struct SpellTargetSelector : public std::unary_function<Unit*, bool>
struct SpellTargetSelector : public ACORE::unary_function<Unit*, bool>
{
public:
SpellTargetSelector(Unit* caster, uint32 spellId);
@@ -92,7 +92,7 @@ struct SpellTargetSelector : public std::unary_function<Unit*, bool>
// Very simple target selector, will just skip main target
// NOTE: When passing to UnitAI::SelectTarget remember to use 0 as position for random selection
// because tank will not be in the temporary list
struct NonTankTargetSelector : public std::unary_function<Unit*, bool>
struct NonTankTargetSelector : public ACORE::unary_function<Unit*, bool>
{
public:
NonTankTargetSelector(Creature* source, bool playerOnly = true) : _source(source), _playerOnly(playerOnly) { }
@@ -104,7 +104,7 @@ struct NonTankTargetSelector : public std::unary_function<Unit*, bool>
};
// Simple selector for units using mana
struct PowerUsersSelector : public std::unary_function<Unit*, bool>
struct PowerUsersSelector : public ACORE::unary_function<Unit*, bool>
{
Unit const* _me;
Powers const _power;
@@ -135,7 +135,7 @@ struct PowerUsersSelector : public std::unary_function<Unit*, bool>
}
};
struct FarthestTargetSelector : public std::unary_function<Unit*, bool>
struct FarthestTargetSelector : public ACORE::unary_function<Unit*, bool>
{
FarthestTargetSelector(Unit const* unit, float dist, bool playerOnly, bool inLos) : _me(unit), _dist(dist), _playerOnly(playerOnly), _inLos(inLos) {}
@@ -191,7 +191,7 @@ class UnitAI
Unit* SelectTarget(SelectAggroTarget targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0);
// Select the targets satifying the predicate.
// predicate shall extend std::unary_function<Unit*, bool>
// predicate shall extend ACORE::unary_function<Unit*, bool>
template <class PREDICATE> Unit* SelectTarget(SelectAggroTarget targetType, uint32 position, PREDICATE const& predicate)
{
ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList();
@@ -241,7 +241,7 @@ class UnitAI
void SelectTargetList(std::list<Unit*>& targetList, uint32 num, SelectAggroTarget targetType, float dist = 0.0f, bool playerOnly = false, int32 aura = 0);
// Select the targets satifying the predicate.
// predicate shall extend std::unary_function<Unit*, bool>
// predicate shall extend ACORE::unary_function<Unit*, bool>
template <class PREDICATE> void SelectTargetList(std::list<Unit*>& targetList, PREDICATE const& predicate, uint32 maxTargets, SelectAggroTarget targetType)
{
ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList();

8
src/server/game/Battlegrounds/BattlegroundMgr.cpp
View File

@@ -36,6 +36,8 @@
#include "BattlegroundQueue.h"
#include "GameGraveyard.h"
#include <unordered_map>
#include <random>
#ifdef ELUNA
#include "LuaEngine.h"
#endif
@@ -998,8 +1000,10 @@ void RandomBattlegroundSystem::Update(uint32 diff)
small.push_back(BATTLEGROUND_AB);
small.push_back(BATTLEGROUND_SA);
std::random_shuffle(big.begin(), big.end());
std::random_shuffle(small.begin(), small.end());
auto rng = std::default_random_engine{};
std::shuffle(big.begin(), big.end(), rng);
std::shuffle(small.begin(), small.end(), rng);
m_BgOrder.push_back(small.back()); small.pop_back();
m_BgOrder.push_back(small.back()); small.pop_back();

2
src/server/game/Loot/LootMgr.cpp
View File

@@ -42,7 +42,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 : public ACORE::unary_function<LootStoreItem*, bool>
{
explicit LootGroupInvalidSelector(Loot const& loot, uint16 lootMode) : _loot(loot), _lootMode(lootMode) { }