(31379c825) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-06-13 11:44:39 +03:00
parent bd5c18aea2
commit a34a6bf1db
3 changed files with 95 additions and 5 deletions
@@ -2047,13 +2047,15 @@ namespace Barotrauma.Networking
            client.SendMessage(msg, NetDeliveryMethod.ReliableUnordered);
        }

-        public void SetupNewCampaign(Submarine sub, string savePath, string mapSeed)
+        public void SetupNewCampaign(Submarine sub, string saveName, string mapSeed)
        {
+            saveName = Path.GetFileNameWithoutExtension(saveName);
+
            NetOutgoingMessage msg = client.CreateMessage();
            msg.Write((byte)ClientPacketHeader.CAMPAIGN_SETUP_INFO);

            msg.Write(true); msg.WritePadBits();
-            msg.Write(savePath);
+            msg.Write(saveName);
            msg.Write(mapSeed);
            msg.Write(sub.Name);
            msg.Write(sub.MD5Hash.Hash);