krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Server] Fix build in Visual Studio

Browse source
This commit is contained in:
David Cernat 2017-10-19 13:04:37 +03:00
parent 4530370e52
commit fb67180809
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/openmw-mp/Script/LuaState.cpp
View file

@ -442,22 +442,21 @@ void LuaState::loadMods(const std::string &modDir, std::vector<std::string> *lis
{ {
using namespace boost::filesystem; using namespace boost::filesystem;
auto readConfig = [this](path path) { auto readConfig = [this](path homePath){
const auto mainScript = "main.lua"; const auto mainScript = "main.lua";
if (!is_directory(path / "mods")) if (!is_directory(homePath / "mods"))
throw runtime_error(path.string() + ": No such directory."); throw runtime_error(homePath.string() + ": No such directory.");
for (const auto &modDir : directory_iterator(path / "mods")) for (const auto &modDir : directory_iterator(homePath / "mods"))
{ {
if (is_directory(modDir.status()) && exists(modDir.path() / mainScript)) if (is_directory(modDir.status()) && exists(modDir.path() / mainScript))
{ {
boost::property_tree::ptree pt; boost::property_tree::ptree pt;
auto _path = path.string() + "/mods/" + modDir.path().filename().string(); auto _path = homePath.string() + "/mods/" + modDir.path().filename().string();
boost::property_tree::read_json(_path + "/modinfo.json", pt); boost::property_tree::read_json(_path + "/modinfo.json", pt);
ServerPluginInfo modInfo; ServerPluginInfo modInfo;
modInfo.path = std::make_pair(homePath.string(), modDir.path().filename().string());
modInfo.path = {path.string(), modDir.path().filename().string()};
modInfo.author = pt.get<string>("author"); modInfo.author = pt.get<string>("author");
modInfo.version = pt.get<string>("version"); modInfo.version = pt.get<string>("version");
@ -522,4 +521,4 @@ void LuaState::loadMods(const std::string &modDir, std::vector<std::string> *lis
} }
dataEnv["Core"]["LOADED_MODS"] = mods.size(); dataEnv["Core"]["LOADED_MODS"] = mods.size();
} }