From 60c85a19f3b18f19611317aa66e90b4fb1da1fe3 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Thu, 23 May 2019 15:12:44 +0300
Subject: [PATCH] (511dc4358) Merge branch 'dev' of
 https://github.com/Regalis11/Barotrauma-development into dev

---
 .../Source/Screens/MainMenuScreen.cs          | 42 +------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs
index 9b49aad8e..dbceca279 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/MainMenuScreen.cs
@@ -521,20 +521,7 @@ namespace Barotrauma
                 GUIButton otherButton = child as GUIButton;
                 if (otherButton == null || otherButton == button) continue;
 
-            return true;
-        }
-
-        public bool ReturnToMainMenu(GUIButton button, object obj)
-        {
-            GUI.PreventPauseMenuToggle = false;
-
-            if (Selected != this)
-            {
-                Select();
-            }
-            else
-            {
-                ResetButtonStates(button);
+                otherButton.Selected = false;
             }
         }
 #endregion
@@ -625,33 +612,6 @@ namespace Barotrauma
 #endif
                 }
             }
-
-            for (int i = 0; i < tutorialList.Content.Children.Count(); i++)
-            {
-                if (i < completedTutorials + 1)
-                {
-                    (tutorialList.Content.GetChild(i) as GUITextBlock).TextColor = Color.LightGreen;
-#if !DEBUG
-                    (tutorialList.Content.GetChild(i) as GUITextBlock).CanBeFocused = true;
-#endif
-                }
-                else
-                {
-                    (tutorialList.Content.GetChild(i) as GUITextBlock).TextColor = Color.Gray;
-#if !DEBUG
-                    (tutorialList.Content.GetChild(i) as GUITextBlock).CanBeFocused = false;
-#endif
-                }
-            }
-        }
-
-        public void ResetSettingsFrame(GameSettings.Tab selectedTab = GameSettings.Tab.Graphics)
-        {
-            menuTabs[(int)Tab.Settings].RectTransform.ClearChildren();
-            GameMain.Config.ResetSettingsFrame();
-            GameMain.Config.CreateSettingsFrame(selectedTab);
-            GameMain.Config.SettingsFrame.RectTransform.Parent = menuTabs[(int)Tab.Settings].RectTransform;
-            GameMain.Config.SettingsFrame.RectTransform.RelativeSize = Vector2.One;
         }
 
         public void ResetSettingsFrame(GameSettings.Tab selectedTab = GameSettings.Tab.Graphics)