Sync with 3.3.5a core

This commit is contained in:
Aokromes committed 2016-05-03 12:40:27 +02:00
1 parent 41e7c525f6
commit 0ac5f4a440
17 files changed
+58 -29

No files matched your search

+6
View File
@@ -56,6 +56,12 @@ bool ConfigMgr::LoadInitial(std::string const& file, std::string& error)
return true;
}
ConfigMgr* ConfigMgr::instance()
{
static ConfigMgr instance;
return &instance;
}
bool ConfigMgr::Reload(std::string& error)
{
return LoadInitial(_filename, error);