nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-05 03:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Config): rework configs load system (#2566)

Browse Source
This commit is contained in:
Kargatum
2020-07-12 22:47:12 +07:00
committed by GitHub
parent 2fb9985a99
commit 94e6ef17a2
8 changed files with 175 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/server/game/World/World.cpp
View File

@@ -124,8 +124,6 @@ World::World()
m_CleaningFlags = 0;
m_configFileList = "";
memset(rate_values, 0, sizeof(rate_values));
memset(m_int_configs, 0, sizeof(m_int_configs));
memset(m_bool_configs, 0, sizeof(m_bool_configs));
@@ -414,46 +412,6 @@ bool World::RemoveQueuedPlayer(WorldSession* sess)
return found;
}
void World::LoadModuleConfigSettings()
{
Tokenizer configFileList(GetConfigFileList(), ',');
for (auto i = configFileList.begin(); i != configFileList.end(); i++)
{
std::string configFile = (*i) + std::string(".conf");
std::string conf_path = _CONF_DIR;
std::string cfg_file = conf_path + "/" + configFile;
#if AC_PLATFORM == AC_PLATFORM_WINDOWS
cfg_file = configFile;
#endif
std::string cfg_def_file = cfg_file + ".dist";
// Load .conf.dist config
if (!sConfigMgr->LoadMore(cfg_def_file.c_str()))
{
sLog->outString();
sLog->outError("Module config: Invalid or missing configuration (*.conf.dist) file : %s", cfg_def_file.c_str());
sLog->outError("Module config: Verify that this file exists and has \'[worldserver]' written at the top of the file!");
// If .conf exists, it will load it so it will NOT use the default hardcoded settings
if (!sConfigMgr->LoadMore(cfg_file.c_str()))
{
sLog->outError("Module config: Using default hardcoded settings.");
}
sLog->outString();
}
// Load .conf config
if (!sConfigMgr->LoadMore(cfg_file.c_str()))
{
sLog->outString();
sLog->outString("Module config: %s not found (or invalid), using default settings from %s", cfg_file.c_str(), cfg_def_file.c_str());
sLog->outString();
}
}
}
/// Initialize config values
void World::LoadConfigSettings(bool reload)
{
@@ -466,8 +424,6 @@ void World::LoadConfigSettings(bool reload)
}
}
LoadModuleConfigSettings();
#ifdef ELUNA
///- Initialize Lua Engine
if (!reload)
@@ -487,6 +443,7 @@ void World::LoadConfigSettings(bool reload)
///- Read the player limit and the Message of the day from the config file
if (!reload)
SetPlayerAmountLimit(sConfigMgr->GetIntDefault("PlayerLimit", 100));
Motd::SetMotd(sConfigMgr->GetStringDefault("Motd", "Welcome to an AzerothCore server"));
///- Read ticket system setting from the config file

6
src/server/game/World/World.h
View File

@@ -703,7 +703,6 @@ class World
void SetInitialWorldSettings();
void LoadConfigSettings(bool reload = false);
void LoadModuleConfigSettings();
void SendWorldText(uint32 string_id, ...);
void SendGlobalText(const char* text, WorldSession* self);
@@ -837,9 +836,6 @@ class World
std::string const& GetRealmName() const { return _realmName; } // pussywizard
void SetRealmName(std::string name) { _realmName = name; } // pussywizard
std::string GetConfigFileList() { return m_configFileList; }
void SetConfigFileList(std::string list) { m_configFileList = list; }
protected:
void _UpdateGameTime();
// callback for UpdateRealmCharacters
@@ -939,8 +935,6 @@ class World
void ProcessQueryCallbacks();
ACE_Future_Set<PreparedQueryResult> m_realmCharCallbacks;
std::string m_configFileList;
};
#define sWorld World::instance()