Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git

2022-02-25 14:52:18 -03:00
parent 4c6549a39c a83f375681
commit acfec0986e
15 changed files with 62 additions and 24 deletions
@@ -13,7 +13,7 @@ namespace Barotrauma
    {
        private static List<ScalableFont> FontList = new List<ScalableFont>();
        private static Library Lib = null;
-        private static object mutex = new object();
+        private readonly object mutex = new object();

        private string filename;
        private Face face;
@@ -256,10 +256,33 @@ namespace Barotrauma
        }

        private void DynamicRenderAtlas(GraphicsDevice gd, uint character, int texDims = 1024, uint baseChar = 0x54)
-            => DynamicRenderAtlas(gd, character.ToEnumerable(), texDims, baseChar);
+        {
+            bool missingCharacterFound = false;
+            lock (mutex)
+            {
+                missingCharacterFound = !texCoords.ContainsKey(character);
+            }
+            if (!missingCharacterFound) { return; }
+            DynamicRenderAtlas(gd, character.ToEnumerable(), texDims, baseChar);
+        }

        private void DynamicRenderAtlas(GraphicsDevice gd, string str, int texDims = 1024, uint baseChar = 0x54)
-            => DynamicRenderAtlas(gd, str.Distinct().Select(c => (uint)c), texDims, baseChar);
+        {
+            bool missingCharacterFound = false;
+            var distinctChrs = str.Distinct().Select(c => (uint)c).ToArray();
+            lock (mutex)
+            {
+                foreach (var character in distinctChrs)
+                {
+                    if (texCoords.ContainsKey(character)) { continue; }
+
+                    missingCharacterFound = true; 
+                    break;
+                }
+            }
+            if (!missingCharacterFound) { return; }
+            DynamicRenderAtlas(gd, distinctChrs, texDims, baseChar);
+        }

        private void DynamicRenderAtlas(GraphicsDevice gd, IEnumerable<uint> characters, int texDims = 1024, uint baseChar = 0x54)
        {
@@ -268,7 +291,7 @@ namespace Barotrauma
                CrossThread.RequestExecutionOnMainThread(() =>
                {
                    DynamicRenderAtlas(gd, characters, texDims, baseChar);
-                });
+                });                
                return;
            }

@@ -1299,7 +1299,7 @@ namespace Barotrauma

        private bool CreateOrder(Order order, Hull targetHull = null)
        {
-            var sub = Character.Controlled.Submarine;
+            var sub = Character.Controlled?.Submarine;

            if (sub == null || sub.TeamID != Character.Controlled.TeamID || sub.Info.IsWreck) { return false; }

@@ -2995,6 +2995,8 @@ namespace Barotrauma.Networking

        public void SetupLoadCampaign(string saveName)
        {
+            if (clientPeer == null) { return; }
+
            GameMain.NetLobbyScreen.CampaignSetupFrame.Visible = false;
            GameMain.NetLobbyScreen.CampaignFrame.Visible = false;

@@ -1743,6 +1743,7 @@ namespace Barotrauma

        public void SetSpectate(bool spectate)
        {
+            if (GameMain.Client == null) { return; }
            this.spectateBox.Selected = spectate;
            if (spectate)
            {