aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/common/Asio/ExpectedCompletionHandler.h4
-rw-r--r--src/common/Collision/RegularGrid.h1
-rw-r--r--src/common/Collision/VMapDefinitions.h1
-rw-r--r--src/common/Utilities/FuzzyFind.h7
-rw-r--r--src/common/Utilities/SmartEnum.h1
-rw-r--r--src/common/Utilities/Util.h9
-rw-r--r--src/server/game/AI/CreatureAIFactory.h1
-rw-r--r--src/server/game/AI/GameObjectAIFactory.h1
-rw-r--r--src/server/game/Globals/PlayerChoice.h1
-rw-r--r--src/server/game/Server/WorldSocketMgr.cpp1
-rw-r--r--src/server/game/Server/WorldSocketMgr.h3
-rw-r--r--src/server/game/Tools/CharacterDatabaseCleaner.h2
-rw-r--r--src/server/game/Warden/Modules/WardenModuleMac.h3
-rw-r--r--src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h6
-rw-r--r--src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h6
-rw-r--r--src/server/scripts/Maelstrom/Stonecore/stonecore.h6
-rw-r--r--src/server/worldserver/Main.cpp1
17 files changed, 34 insertions, 20 deletions
diff --git a/src/common/Asio/ExpectedCompletionHandler.h b/src/common/Asio/ExpectedCompletionHandler.h
index 98d7dd27180..d03c101118c 100644
--- a/src/common/Asio/ExpectedCompletionHandler.h
+++ b/src/common/Asio/ExpectedCompletionHandler.h
@@ -232,7 +232,7 @@ public:
static inline auto initiate(Initiation&& initiation, RawCompletionToken&& token, Args&&... args)
{
return async_initiate<
- conditional_t<
+ std::conditional_t<
is_const<remove_reference_t<RawCompletionToken>>::value,
CompletionToken const, CompletionToken>,
typename Trinity::Asio::Impl::AsExpectedSignature<Signatures>::type...>(
@@ -311,7 +311,7 @@ public:
static inline auto initiate(Initiation&& initiation, RawCompletionToken&& token, Args&&... args)
{
return async_initiate<
- conditional_t<
+ std::conditional_t<
is_const<remove_reference_t<RawCompletionToken>>::value,
CompletionToken const, CompletionToken>,
typename Trinity::Asio::Impl::AsExpectedSignature<Signature>::type>(
diff --git a/src/common/Collision/RegularGrid.h b/src/common/Collision/RegularGrid.h
index 94f97b2cb5a..57ef8094297 100644
--- a/src/common/Collision/RegularGrid.h
+++ b/src/common/Collision/RegularGrid.h
@@ -23,6 +23,7 @@
#include <G3D/Ray.h>
#include <G3D/BoundsTrait.h>
#include <memory>
+#include <span>
#include <unordered_map>
template<class Node>
diff --git a/src/common/Collision/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h
index 7f0c10406e4..2006cf9ed53 100644
--- a/src/common/Collision/VMapDefinitions.h
+++ b/src/common/Collision/VMapDefinitions.h
@@ -18,6 +18,7 @@
#ifndef _VMAPDEFINITIONS_H
#define _VMAPDEFINITIONS_H
+#include "Define.h"
#include <cstdio>
#define LIQUID_TILE_SIZE (533.333f / 128.f)
diff --git a/src/common/Utilities/FuzzyFind.h b/src/common/Utilities/FuzzyFind.h
index 9b70fc7cb39..a402c60c1cc 100644
--- a/src/common/Utilities/FuzzyFind.h
+++ b/src/common/Utilities/FuzzyFind.h
@@ -19,15 +19,16 @@
#define TRINITY_FUZZYFIND_H
#include <map>
-#include <string>
#include <type_traits>
+struct StringContainsStringI_T;
+
namespace Trinity
{
namespace Containers
{
- template <typename Container, typename NeedleContainer, typename ContainsOperator = bool(std::string const&, std::string const&), typename T = void>
- auto FuzzyFindIn(Container const& container, NeedleContainer const& needles, ContainsOperator const& contains = StringContainsStringI, int(*bonus)(decltype((*std::begin(std::declval<Container>())))) = nullptr)
+ template <typename Container, typename NeedleContainer, typename ContainsOperator = StringContainsStringI_T, typename T = void>
+ auto FuzzyFindIn(Container const& container, NeedleContainer const& needles, ContainsOperator const& contains = {}, int(*bonus)(decltype((*std::begin(std::declval<Container>())))) = nullptr)
{
using IteratorResult = decltype((*std::begin(container)));
using MappedType = std::conditional_t<std::is_reference_v<IteratorResult>, std::reference_wrapper<std::remove_reference_t<IteratorResult>>, IteratorResult>;
diff --git a/src/common/Utilities/SmartEnum.h b/src/common/Utilities/SmartEnum.h
index 3c58d433406..ae915f31694 100644
--- a/src/common/Utilities/SmartEnum.h
+++ b/src/common/Utilities/SmartEnum.h
@@ -18,6 +18,7 @@
#ifndef TRINITY_SMARTENUM_H
#define TRINITY_SMARTENUM_H
+#include "Define.h"
#include "IteratorPair.h"
#include <iterator>
diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h
index e3c63e0e968..9f65fd9b163 100644
--- a/src/common/Utilities/Util.h
+++ b/src/common/Utilities/Util.h
@@ -458,9 +458,16 @@ inline std::vector<uint8> HexStrToByteVector(std::string_view str, bool reverse
TC_COMMON_API float DegToRad(float degrees);
TC_COMMON_API bool StringEqualI(std::string_view str1, std::string_view str2);
-inline bool StringStartsWith(std::string_view haystack, std::string_view needle) { return (haystack.substr(0, needle.length()) == needle); }
+inline bool StringStartsWith(std::string_view haystack, std::string_view needle) { return haystack.starts_with(needle); }
inline bool StringStartsWithI(std::string_view haystack, std::string_view needle) { return StringEqualI(haystack.substr(0, needle.length()), needle); }
+
TC_COMMON_API bool StringContainsStringI(std::string_view haystack, std::string_view needle);
+
+struct StringContainsStringI_T
+{
+ bool operator()(std::string_view haystack, std::string_view needle) const { return StringContainsStringI(haystack, needle); }
+};
+
TC_COMMON_API bool StringCompareLessI(std::string_view a, std::string_view b);
struct StringCompareLessI_T
diff --git a/src/server/game/AI/CreatureAIFactory.h b/src/server/game/AI/CreatureAIFactory.h
index 3d269416902..2408ff0ce4b 100644
--- a/src/server/game/AI/CreatureAIFactory.h
+++ b/src/server/game/AI/CreatureAIFactory.h
@@ -19,7 +19,6 @@
#define TRINITY_CREATUREAIFACTORY_H
#include "ObjectMgr.h"
-#include "ObjectRegistry.h"
#include "SelectableAI.h"
class Creature;
diff --git a/src/server/game/AI/GameObjectAIFactory.h b/src/server/game/AI/GameObjectAIFactory.h
index f3a57c4705d..522aea6cb74 100644
--- a/src/server/game/AI/GameObjectAIFactory.h
+++ b/src/server/game/AI/GameObjectAIFactory.h
@@ -18,6 +18,7 @@
#ifndef TRINITY_GAMEOBJECTAIFACTORY_H
#define TRINITY_GAMEOBJECTAIFACTORY_H
+#include "ObjectMgr.h"
#include "SelectableAI.h"
class GameObject;
diff --git a/src/server/game/Globals/PlayerChoice.h b/src/server/game/Globals/PlayerChoice.h
index 3a8e7948d8e..17504586b35 100644
--- a/src/server/game/Globals/PlayerChoice.h
+++ b/src/server/game/Globals/PlayerChoice.h
@@ -19,6 +19,7 @@
#define TRINITYCORE_PLAYER_CHOICE_H
#include "Define.h"
+#include "Duration.h"
#include "EnumFlag.h"
#include "Optional.h"
#include <algorithm>
diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp
index cc44e5bad4b..4205b6912f0 100644
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -19,7 +19,6 @@
#include "Config.h"
#include "NetworkThread.h"
#include "ScriptMgr.h"
-#include "WorldSocket.h"
#include <boost/system/error_code.hpp>
class WorldSocketThread : public Trinity::Net::NetworkThread<WorldSocket>
diff --git a/src/server/game/Server/WorldSocketMgr.h b/src/server/game/Server/WorldSocketMgr.h
index 8859da81074..9f905f23cd2 100644
--- a/src/server/game/Server/WorldSocketMgr.h
+++ b/src/server/game/Server/WorldSocketMgr.h
@@ -19,8 +19,7 @@
#define TRINITYCORE_WORLD_SOCKET_MGR_H
#include "SocketMgr.h"
-
-class WorldSocket;
+#include "WorldSocket.h"
/// Manages all sockets connected to peers and network threads
class TC_GAME_API WorldSocketMgr : public Trinity::Net::SocketMgr<WorldSocket>
diff --git a/src/server/game/Tools/CharacterDatabaseCleaner.h b/src/server/game/Tools/CharacterDatabaseCleaner.h
index 83a639f99ab..249eb959f66 100644
--- a/src/server/game/Tools/CharacterDatabaseCleaner.h
+++ b/src/server/game/Tools/CharacterDatabaseCleaner.h
@@ -18,6 +18,8 @@
#ifndef CHARACTERDATABASECLEANER_H
#define CHARACTERDATABASECLEANER_H
+#include "Define.h"
+
namespace CharacterDatabaseCleaner
{
enum CleaningFlags
diff --git a/src/server/game/Warden/Modules/WardenModuleMac.h b/src/server/game/Warden/Modules/WardenModuleMac.h
index a699261a284..3ab4a5b64b0 100644
--- a/src/server/game/Warden/Modules/WardenModuleMac.h
+++ b/src/server/game/Warden/Modules/WardenModuleMac.h
@@ -18,6 +18,9 @@
#ifndef _WARDEN_MODULE_MAC_H
#define _WARDEN_MODULE_MAC_H
+#include "Define.h"
+#include <array>
+
std::array<uint8, 9318> Module_0DBBF209A27B1E279A9FEC5C168A15F7_Data =
{
0x07, 0x0C, 0x44, 0xCD, 0xC9, 0xFB, 0x99, 0xBC, 0x7C, 0x77, 0xDC, 0xE8, 0x8D, 0x07, 0xBE, 0x55,
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
index 2778ab7c609..19ac3c0d538 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
@@ -45,10 +45,10 @@ enum BRCCreatureIds
NPC_ROMOGG_BONECRUSHER = 39665
};
-template<typename AI>
-inline AI* GetBlackrockCavernsAI(Creature* creature)
+template <class AI, class T>
+inline AI* GetBlackrockCavernsAI(T* obj)
{
- return GetInstanceAI<AI>(creature, BCScriptName);
+ return GetInstanceAI<AI>(obj, BCScriptName);
}
#endif // BLACKROCKCAVERNS_H_
diff --git a/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h b/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h
index ede0b8fdc56..f12fc18b24e 100644
--- a/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h
+++ b/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h
@@ -41,10 +41,10 @@ enum SSCreatureIds
NPC_MORTIMER_MOLOCH = 46482
};
-template<typename AI>
-inline AI* GetStormwindStockadeAI(Creature* creature)
+template <class AI, class T>
+inline AI* GetStormwindStockadeAI(T* obj)
{
- return GetInstanceAI<AI>(creature, StormwindStockadeScriptName);
+ return GetInstanceAI<AI>(obj, StormwindStockadeScriptName);
}
#define RegisterStormwindStockadesAI(AI) RegisterCreatureAIWithFactory(AI, GetStormwindStockadeAI)
diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.h b/src/server/scripts/Maelstrom/Stonecore/stonecore.h
index 2a79ea3fed1..4b311137912 100644
--- a/src/server/scripts/Maelstrom/Stonecore/stonecore.h
+++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.h
@@ -76,10 +76,10 @@ enum SCMisc
CREATURE_FORMATION_MILLHOUSE_EVENT_LAST_GROUP = 340492,
};
-template<typename AI>
-inline AI* GetStonecoreAI(Creature* creature)
+template <class AI, class T>
+inline AI* GetStonecoreAI(T* obj)
{
- return GetInstanceAI<AI>(creature, SCScriptName);
+ return GetInstanceAI<AI>(obj, SCScriptName);
}
#endif // DEF_STONECORE
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index ba5c8f9c758..256069f3a06 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -49,7 +49,6 @@
#include "TerrainMgr.h"
#include "ThreadPool.h"
#include "World.h"
-#include "WorldSocket.h"
#include "WorldSocketMgr.h"
#include "Util.h"
#include <openssl/opensslv.h>