(5a377a8ee) Unstable v0.9.1000.0

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs

@@ -1,4 +1,5 @@
-using Barotrauma.Items.Components;
+using Barotrauma.IO;
+using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -9,7 +10,7 @@ namespace Barotrauma
 {
     partial class GameSession
     {
-        public enum InfoFrameTab { Crew, Mission, MyCharacter, ManagePlayers };
+        public enum InfoFrameTab { Crew, Mission, MyCharacter, Traitor };
 
         public readonly EventManager EventManager;
 
@@ -231,7 +232,7 @@ namespace Barotrauma
                         if (port.Item.WorldPosition.Y < Submarine.WorldPosition.Y) { continue; }
 
                         float dist = Vector2.DistanceSquared(port.Item.WorldPosition, level.StartOutpost.WorldPosition);
-                        if (myPort == null || dist < closestDistance || (port.MainDockingPort && !myPort.MainDockingPort))
+                        if ((myPort == null || dist < closestDistance || port.MainDockingPort) && !(myPort?.MainDockingPort ?? false))
                         {
                             myPort = port;
                             closestDistance = dist;
@@ -351,6 +352,8 @@ namespace Barotrauma
                     OnClicked = (GUIButton button, object obj) => { GUIMessageBox.MessageBoxes.Remove(summaryFrame); return true; }
                 };
             }
+
+            TabMenu.OnRoundEnded();
 #endif
 
             EventManager?.EndRound();
@@ -461,7 +464,7 @@ namespace Barotrauma
 
             try
             {
-                doc.Save(filePath);
+                doc.SaveSafe(filePath);
             }
             catch (Exception e)
             {