diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-30 22:26:59 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-30 22:26:59 +0200 |
| commit | a917b6599f599419767b8683b591a96d9cdb7092 (patch) | |
| tree | 16af20ae09d8a13eca0f74d00e5027da6ed608be /src/server/shared/Configuration/Config.h | |
| parent | d89a5d2d176000535ca857ab6ce600607a747358 (diff) | |
| parent | 01b733eb69691ccd1ac8e9884ff2a4cb4643a7cf (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Server/WorldSocket.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
Diffstat (limited to 'src/server/shared/Configuration/Config.h')
| -rw-r--r-- | src/server/shared/Configuration/Config.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/shared/Configuration/Config.h b/src/server/shared/Configuration/Config.h index 42c3a700f3f..ff0233b5669 100644 --- a/src/server/shared/Configuration/Config.h +++ b/src/server/shared/Configuration/Config.h @@ -31,7 +31,7 @@ class ConfigMgr public: /// Method used only for loading main configuration files (authserver.conf and worldserver.conf) - bool LoadInitial(std::string const& file); + bool LoadInitial(std::string const& file, std::string& error); static ConfigMgr* instance() { @@ -39,7 +39,7 @@ public: return &instance; } - bool Reload(); + bool Reload(std::string& error); std::string GetStringDefault(std::string const& name, const std::string& def); bool GetBoolDefault(std::string const& name, bool def); |