From 2fca5545553bcb368096d27bd1f72cda99e52520 Mon Sep 17 00:00:00 2001 From: Смердокрыл Date: Fri, 9 Jun 2023 21:36:03 +0300 Subject: Core/Config: Implement reading config overrides from subdirectory (#29068) Co-authored-by: Shauren (cherry picked from commit 74a4dc46b49e1902f44a36b5b3155ad103d8f3da) --- src/common/Configuration/Config.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/common/Configuration/Config.h') diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h index 3e8dabe8ce3..0398506e9f9 100644 --- a/src/common/Configuration/Config.h +++ b/src/common/Configuration/Config.h @@ -20,6 +20,7 @@ #include "Define.h" #include +#include #include class TC_COMMON_API ConfigMgr @@ -33,6 +34,7 @@ public: /// Method used only for loading main configuration files (authserver.conf and worldserver.conf) bool LoadInitial(std::string file, std::vector args, std::string& error); bool LoadAdditionalFile(std::string file, bool keepOnReload, std::string& error); + bool LoadAdditionalDir(std::string const& dir, bool keepOnReload, std::vector& loadedFiles, std::vector& errors); /// Overrides configuration with environment variables and returns overridden keys std::vector OverrideWithEnvVariablesIfAny(); -- cgit v1.2.3