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

Barotrauma/BarotraumaClient/Source/Characters/Character.cs

@@ -138,6 +138,9 @@ namespace Barotrauma
             }
         }
 
+            hudProgressBars = new Dictionary<object, HUDProgressBar>();
+        }
+
         partial void UpdateLimbLightSource(Limb limb)
         {
             if (limb.LightSource != null)
@@ -146,12 +149,14 @@ namespace Barotrauma
             }
         }
 
+        private bool wasFiring;
+
         /// <summary>
         /// Control the Character according to player input
         /// </summary>
         public void ControlLocalPlayer(float deltaTime, Camera cam, bool moveCam = true)
         {
-            if (DisableControls)
+            if (DisableControls || GUI.PauseMenuOpen || GUI.SettingsMenuOpen)
             {
                 foreach (Key key in keys)
                 {
@@ -161,10 +166,25 @@ namespace Barotrauma
             }
             else
             {
+                wasFiring |= keys[(int)InputType.Aim].Held && keys[(int)InputType.Shoot].Held;
                 for (int i = 0; i < keys.Length; i++)
                 {
                     keys[i].SetState();
                 }
+                //if we were firing (= pressing the aim and shoot keys at the same time)
+                //and the fire key is the same as Select or Use, reset the key to prevent accidentally selecting/using items
+                if (wasFiring && !keys[(int)InputType.Shoot].Held)
+                {
+                    if (GameMain.Config.KeyBind(InputType.Shoot).Equals(GameMain.Config.KeyBind(InputType.Select)))
+                    {
+                        keys[(int)InputType.Select].Reset();
+                    }
+                    if (GameMain.Config.KeyBind(InputType.Shoot).Equals(GameMain.Config.KeyBind(InputType.Use)))
+                    {
+                        keys[(int)InputType.Use].Reset();
+                    }
+                    wasFiring = false;
+                }
 
                 float targetOffsetAmount = 0.0f;
                 if (moveCam)