From 0284f1887657cff6f8e15d5d974ea8efa23950e3 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 3 May 2017 02:15:14 +0300 Subject: [PATCH] [Client] Replace plugin load order message with a clearer one at the top --- apps/openmw/mwmp/Networking.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp index db070c463..07540fdf8 100644 --- a/apps/openmw/mwmp/Networking.cpp +++ b/apps/openmw/mwmp/Networking.cpp @@ -59,6 +59,7 @@ string intToHexStr(unsigned val) string comparePlugins(PacketPreInit::PluginContainer checksums, PacketPreInit::PluginContainer checksumsResponse) { std::ostringstream sstr; + sstr << "Your plugins or their load order don't match the server's.\n\n"; sstr << "Your current plugins are:\n"; const int maxLineLength = 100; @@ -117,7 +118,6 @@ string comparePlugins(PacketPreInit::PluginContainer checksums, PacketPreInit::P lineLength = lineLength + plugin.size() + 13; } - sstr << "\n\nNote: Use the same load order as the server."; return sstr.str(); } @@ -135,6 +135,7 @@ string comparePluginsMonospaced(PacketPreInit::PluginContainer checksums, Packet if (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); sstr << "To join this server, use:\n"; @@ -175,7 +176,6 @@ string comparePluginsMonospaced(PacketPreInit::PluginContainer checksums, Packet sstr << "\n"; } - sstr << "\nNote: Use the same load order as the server."; return sstr.str(); }