v0.11.0.9

2020-12-09 16:34:16 +02:00
parent bbf06f0984
commit f433a7ba10
325 changed files with 13947 additions and 3652 deletions
@@ -65,10 +65,8 @@ namespace Barotrauma
            keyMapping[(int)InputType.Voice] = new KeyOrMouse(Keys.V);
            keyMapping[(int)InputType.LocalVoice] = new KeyOrMouse(Keys.B);
            keyMapping[(int)InputType.Command] = new KeyOrMouse(MouseButton.MiddleMouse);
-#if DEBUG
            keyMapping[(int)InputType.PreviousFireMode] = new KeyOrMouse(MouseButton.MouseWheelDown);
            keyMapping[(int)InputType.NextFireMode] = new KeyOrMouse(MouseButton.MouseWheelUp);
-#endif

            if (Language == "French")
            {
@@ -1335,7 +1333,7 @@ namespace Barotrauma
                    };
                    msgBox.Buttons[0].OnClicked = (yesButton, obj) =>
                    {
-                        LoadDefaultConfig(setLanguage: false);
+                        LoadDefaultConfig(setLanguage: false, loadContentPackages: Screen.Selected != GameMain.GameScreen);
                        CheckBindings(true);
                        RefreshItemMessages();
                        ApplySettings();