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

[Server] Fix indents

Browse source
This commit is contained in:
Koncord 2017-10-19 10:26:03 +08:00
parent fc3f2483ee
commit ce6a4e4032
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -501,14 +501,14 @@ void LuaState::loadMods(std::vector<std::string> *list)
vector<vector<ServerPluginInfo>::iterator> sortedPluginList; vector<vector<ServerPluginInfo>::iterator> sortedPluginList;
if(list != nullptr && !list->empty()) // manual sorted list if (list != nullptr && !list->empty()) // manual sorted list
{ {
for(const auto &mssp : *list) for (const auto &mssp : *list)
{ {
bool found = false; bool found = false;
for (auto it = mods.begin(); it != mods.end(); ++it) for (auto it = mods.begin(); it != mods.end(); ++it)
{ {
if(it->name == mssp) if (it->name == mssp)
{ {
checkDependencies(mods, *it, false); // check dependencies, but do not throw exceptions checkDependencies(mods, *it, false); // check dependencies, but do not throw exceptions
sortedPluginList.push_back(it); sortedPluginList.push_back(it);
@ -516,14 +516,14 @@ void LuaState::loadMods(std::vector<std::string> *list)
break; break;
} }
} }
if(!found) if (!found)
throw runtime_error("Plugin: \"" + mssp + "\" not found"); throw runtime_error("Plugin: \"" + mssp + "\" not found");
} }
} }
else else
sortedPluginList = loadOrderSolver(mods); sortedPluginList = loadOrderSolver(mods);
for(auto &&mod : sortedPluginList) for (auto &&mod : sortedPluginList)
{ {
mod->env = openScript(mod->path.first, mod->path.second); mod->env = openScript(mod->path.first, mod->path.second);

4
apps/openmw-mp/main.cpp
View file

@ -248,7 +248,7 @@ int main(int argc, char *argv[])
if(mgr.getBool("autoSort", "Plugins")) if (mgr.getBool("autoSort", "Plugins"))
networking.getState().loadMods(); networking.getState().loadMods();
else else
{ {
@ -259,7 +259,7 @@ int main(int argc, char *argv[])
for (int i = 0;; ++i) for (int i = 0;; ++i)
list.push_back(mgr.getString("Plugin" + to_string(i), "Plugins")); list.push_back(mgr.getString("Plugin" + to_string(i), "Plugins"));
} }
catch(...) {} // Manager::getString throws runtime_error exception if setting is not exist catch (...) {} // Manager::getString throws runtime_error exception if setting is not exist
networking.getState().loadMods(&list); networking.getState().loadMods(&list);
} }