(3622747f3) Unstable 0.9.705.0

2020-02-08 21:46:05 +02:00
parent 6754b9d5a2
commit 8324d20464
44 changed files with 403 additions and 265 deletions
@@ -638,13 +638,14 @@ namespace Barotrauma.Items.Components
                signalWarningText.Text = TextManager.Get(signalStrength <= 0.0f ? "SonarNoSignal" : "SonarSignalWeak");
                signalWarningText.Color = signalStrength <= 0.0f ? negativeColor : warningColor;
                signalWarningText.Visible = true;
+                return;
            }
            else
            {
                signalWarningText.Visible = false;
            }

-            if (GameMain.GameSession == null) return;
+            if (GameMain.GameSession == null) { return; }

            DrawMarker(spriteBatch,
                GameMain.GameSession.StartLocation.Name,
@@ -1376,6 +1377,8 @@ namespace Barotrauma.Items.Components
                sprite.Remove();
            }
            targetIcons.Clear();
+
+            GameMain.Instance.OnResolutionChanged -= RecreateGUI;
        }

        public void ClientWrite(IWriteMessage msg, object[] extraData = null)