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

[Client] Replace plugin load order message with a clearer one at the top

Browse source
This commit is contained in:
David Cernat 2017-05-03 02:15:14 +03:00
parent 1dbe9f0eaa
commit 0284f18876
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmp/Networking.cpp
View file

@ -59,6 +59,7 @@ string intToHexStr(unsigned val)
string comparePlugins(PacketPreInit::PluginContainer checksums, PacketPreInit::PluginContainer checksumsResponse) string comparePlugins(PacketPreInit::PluginContainer checksums, PacketPreInit::PluginContainer checksumsResponse)
{ {
std::ostringstream sstr; std::ostringstream sstr;
sstr << "Your plugins or their load order don't match the server's.\n\n";
sstr << "Your current plugins are:\n"; sstr << "Your current plugins are:\n";
const int maxLineLength = 100; const int maxLineLength = 100;
@ -117,7 +118,6 @@ string comparePlugins(PacketPreInit::PluginContainer checksums, PacketPreInit::P
lineLength = lineLength + plugin.size() + 13; lineLength = lineLength + plugin.size() + 13;
} }
sstr << "\n\nNote: Use the same load order as the server.";
return sstr.str(); return sstr.str();
} }
@ -135,6 +135,7 @@ string comparePluginsMonospaced(PacketPreInit::PluginContainer checksums, Packet
if (pluginNameLen2 < checksumsResponse[i].first.size()) if (pluginNameLen2 < checksumsResponse[i].first.size())
pluginNameLen2 = checksumsResponse[i].first.size(); pluginNameLen2 = checksumsResponse[i].first.size();
sstr << "Your plugins or their load order don't match the server's.\n\n";
printWithWidth(sstr, "Your current plugins are:", pluginNameLen1 + 16); printWithWidth(sstr, "Your current plugins are:", pluginNameLen1 + 16);
sstr << "To join this server, use:\n"; sstr << "To join this server, use:\n";
@ -175,7 +176,6 @@ string comparePluginsMonospaced(PacketPreInit::PluginContainer checksums, Packet
sstr << "\n"; sstr << "\n";
} }
sstr << "\nNote: Use the same load order as the server.";
return sstr.str(); return sstr.str();
} }