diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-08-29 22:01:21 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-04 13:05:06 +0100 |
| commit | 7cd98cd7d2e5723abdad12aed19213cb5b619189 (patch) | |
| tree | e76978b0253d864aa3217384bf410a1530dc14cd /src/common/Configuration/Config.h | |
| parent | 2aaebc193c231878133b70e466bd564645db5e4e (diff) | |
Core/Config: Restore ability to load additional config files for custom scripts
(cherry picked from commit c1e4cfd07eee19069a15e9b82a308d8a914d5637)
Diffstat (limited to 'src/common/Configuration/Config.h')
| -rw-r--r-- | src/common/Configuration/Config.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/Configuration/Config.h b/src/common/Configuration/Config.h index 4c42b2e7b34..6a37be56bd6 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 (bnetserver.conf and worldserver.conf) - bool LoadInitial(std::string const& file, std::vector<std::string> args, std::string& error); + bool LoadInitial(std::string file, std::vector<std::string> 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<std::string>& 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; |