From c1e4cfd07eee19069a15e9b82a308d8a914d5637 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 29 Aug 2020 22:01:21 +0200 Subject: Core/Config: Restore ability to load additional config files for custom scripts --- src/common/Configuration/Config.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/common/Configuration/Config.h') diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h index 9f348f063ee..ce1763b4dfd 100644 --- a/src/common/Configuration/Config.h +++ b/src/common/Configuration/Config.h @@ -31,11 +31,12 @@ class TC_COMMON_API ConfigMgr public: /// Method used only for loading main configuration files (authserver.conf and worldserver.conf) - bool LoadInitial(std::string const& file, std::vector args, std::string& error); + bool LoadInitial(std::string file, std::vector args, std::string& error); + bool LoadAdditionalFile(std::string file, bool keepOnReload, std::string& error); static ConfigMgr* instance(); - bool Reload(std::string& error); + bool Reload(std::vector& errors); std::string GetStringDefault(std::string const& name, const std::string& def, bool quiet = false) const; bool GetBoolDefault(std::string const& name, bool def, bool quiet = false) const; -- cgit v1.2.3