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

Eluna: load the configuration file using the new method. (#1546)

Browse Source
This commit is contained in:
ayase
2019-03-03 15:24:43 +08:00
committed by Viste(Кирилл)
parent 1b62af3e14
commit be3abe21d9
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -456,6 +456,16 @@ void World::LoadConfigSettings(bool reload)
}
LoadModuleConfigSettings();
#ifdef ELUNA
///- Initialize Lua Engine
if (!reload)
{
sLog->outString("Initialize Eluna Lua Engine...");
Eluna::Initialize();
}
#endif
sScriptMgr->OnBeforeConfigLoad(reload);
// Reload log levels and filters
@@ -1331,21 +1341,6 @@ void World::SetInitialWorldSettings()
vmmgr2->GetLiquidFlagsPtr = &GetLiquidFlags;
}
#ifdef ELUNA
///- Initialize Lua Engine
sLog->outString("Initialize Eluna Lua Engine...");
std::string conf_path = _CONF_DIR;
std::string cfg_file = conf_path + "/mod_LuaEngine.conf";
#ifdef WIN32
cfg_file = "mod_LuaEngine.conf";
#endif
std::string cfg_def_file = cfg_file + ".dist";
sConfigMgr->LoadMore(cfg_def_file.c_str());
sConfigMgr->LoadMore(cfg_file.c_str());
Eluna::Initialize();
#endif
///- Initialize config settings
LoadConfigSettings();