Unstable 1.2.1.0

2023-11-10 17:45:19 +02:00
parent 2ea58c58a7
commit 8a2e2ea0ae
268 changed files with 4076 additions and 1843 deletions
@@ -548,6 +548,19 @@ namespace Barotrauma
                currentConfig.Graphics.VSync != newConfig.Graphics.VSync ||
                currentConfig.Graphics.DisplayMode != newConfig.Graphics.DisplayMode;

+#if CLIENT
+            bool keybindsChanged = false;
+            foreach (var kvp in newConfig.KeyMap.Bindings)
+            {
+                if (!currentConfig.KeyMap.Bindings.TryGetValue(kvp.Key, out var existingBinding) ||
+                    existingBinding != kvp.Value)
+                {
+                    keybindsChanged = true;
+                    break;
+                }
+            }
+#endif
+
            currentConfig = newConfig;

 #if CLIENT
@@ -575,7 +588,19 @@ namespace Barotrauma
                HUDLayoutSettings.CreateAreas();
                GameMain.GameSession?.HUDScaleChanged();
            }
-            
+
+            if (keybindsChanged)
+            {
+                foreach (var item in Item.ItemList)
+                {
+                    foreach (var ic in item.Components)
+                    {
+                        //parse messages because they may contain keybind texts
+                        ic.ParseMsg();
+                    }
+                }
+            }
+
            GameMain.SoundManager?.ApplySettings();
 #endif
            if (languageChanged) { TextManager.ClearCache(); }