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

[Server] Fix issues after rebase

Browse source
This commit is contained in:
Koncord 2019-02-12 05:32:28 +08:00
parent c550697443
commit 860897fbd7
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw-mp/Networking.cpp
View file

@ -77,7 +77,7 @@ Networking::~Networking()
void Networking::setServerPassword(const std::string &passw) noexcept void Networking::setServerPassword(const std::string &passw) noexcept
{ {
serverPassword = password.empty() ? TES3MP_DEFAULT_PASSW : password; serverPassword = passw.empty() ? TES3MP_DEFAULT_PASSW : passw;
} }
bool Networking::isPassworded() const bool Networking::isPassworded() const

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

@ -245,13 +245,8 @@ int main(int argc, char *argv[])
try try
{ {
<<<<<<< 0.7.0
for (auto plugin : plugins)
Script::LoadScript(plugin.c_str(), pluginHome.c_str());
=======
for (const auto &plugin : plugins) for (const auto &plugin : plugins)
Plugin::LoadPlugin(Utils::convertPath(plugin_home + "/scripts/" + plugin)); Plugin::LoadPlugin(Utils::convertPath(pluginHome + "/scripts/" + plugin));
>>>>>>> [Server] Rework Plugin API, move Lua system to external library
switch (peer->Startup((unsigned) players, &sd, 1)) switch (peer->Startup((unsigned) players, &sd, 1))
{ {