nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 18:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Config): implement loading files optional (#8198)

Browse Source
This commit is contained in:
Kargatum
2021-12-10 17:53:31 +07:00
committed by GitHub
parent e5cbba1c4c
commit 0f1c0c154d
6 changed files with 142 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/worldserver/Main.cpp
View File

@@ -195,14 +195,11 @@ int main(int argc, char** argv)
}
// Add file and args in config
sConfigMgr->Configure(configFile, std::vector<std::string>(argv, argv + argc), CONFIG_FILE_LIST);
sConfigMgr->Configure(configFile, { argv, argv + argc }, CONFIG_FILE_LIST);
if (!sConfigMgr->LoadAppConfigs())
return 1;
// Loading modules configs
sConfigMgr->LoadModulesConfigs();
std::shared_ptr<Acore::Asio::IoContext> ioContext = std::make_shared<Acore::Asio::IoContext>();
// Init all logs
@@ -318,8 +315,8 @@ int main(int argc, char** argv)
Acore::Module::SetEnableModulesList(AC_MODULES_LIST);
// Loading modules configs
sConfigMgr->PrintLoadedModulesConfigs();
// Loading modules configs before scripts
sConfigMgr->LoadModulesConfigs();
///- Initialize the World
sSecretMgr->Initialize();
@@ -457,7 +454,7 @@ bool StartDB()
return false;
///- Get the realm Id from the configuration file
realm.Id.Realm = sConfigMgr->GetIntDefault("RealmID", 0);
realm.Id.Realm = sConfigMgr->GetOption<uint32>("RealmID", 0);
if (!realm.Id.Realm)
{
LOG_ERROR("server.worldserver", "Realm ID not defined in configuration file");