From 0566ed1a9b15a105530ab800865077bc68ab5a9e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 21 Dec 2020 18:38:44 +0900
Subject: [PATCH] Add button to main menu

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 11 +++++------
 osu.Game/Screens/Menu/MainMenu.cs     |  5 +++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 4becdd58cd..0014f6768f 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -42,8 +42,7 @@ namespace osu.Game.Screens.Menu
         public Action OnBeatmapListing;
         public Action OnSolo;
         public Action OnSettings;
-        public Action OnMulti;
-        public Action OnChart;
+        public Action<bool> OnMulti;
 
         public const float BUTTON_WIDTH = 140f;
         public const float WEDGE_WIDTH = 20;
@@ -124,8 +123,8 @@ namespace osu.Game.Screens.Menu
         private void load(AudioManager audio, IdleTracker idleTracker, GameHost host)
         {
             buttonsPlay.Add(new Button(@"solo", @"button-solo-select", FontAwesome.Solid.User, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
-            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), onMulti, 0, Key.M));
-            buttonsPlay.Add(new Button(@"chart", @"button-generic-select", OsuIcon.Charts, new Color4(80, 53, 160, 255), () => OnChart?.Invoke()));
+            buttonsPlay.Add(new Button(@"multi", @"button-generic-select", OsuIcon.Charts, new Color4(94, 63, 186, 255), () => onMulti(true), 0, Key.M));
+            buttonsPlay.Add(new Button(@"timeshift", @"button-generic-select", FontAwesome.Solid.Users, new Color4(94, 63, 186, 255), () => onMulti(false), 0, Key.L));
             buttonsPlay.ForEach(b => b.VisibleState = ButtonSystemState.Play);
 
             buttonsTopLevel.Add(new Button(@"play", @"button-play-select", OsuIcon.Logo, new Color4(102, 68, 204, 255), () => State = ButtonSystemState.Play, WEDGE_WIDTH, Key.P));
@@ -154,7 +153,7 @@ namespace osu.Game.Screens.Menu
             sampleBack = audio.Samples.Get(@"Menu/button-back-select");
         }
 
-        private void onMulti()
+        private void onMulti(bool realtime)
         {
             if (!api.IsLoggedIn)
             {
@@ -172,7 +171,7 @@ namespace osu.Game.Screens.Menu
                 return;
             }
 
-            OnMulti?.Invoke();
+            OnMulti?.Invoke(realtime);
         }
 
         private void updateIdleState(bool isIdle)
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index b781c347f0..391bbf8429 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -17,6 +17,8 @@ using osu.Game.Online.API;
 using osu.Game.Overlays;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Edit;
+using osu.Game.Screens.Multi;
+using osu.Game.Screens.Multi.RealtimeMultiplayer;
 using osu.Game.Screens.Multi.Timeshift;
 using osu.Game.Screens.Select;
 
@@ -104,7 +106,7 @@ namespace osu.Game.Screens.Menu
                                 this.Push(new Editor());
                             },
                             OnSolo = onSolo,
-                            OnMulti = delegate { this.Push(new TimeshiftMultiplayer()); },
+                            OnMulti = realtime => this.Push(realtime ? (Multiplayer)new RealtimeMultiplayer() : new TimeshiftMultiplayer()),
                             OnExit = confirmAndExit,
                         }
                     }
@@ -136,7 +138,6 @@ namespace osu.Game.Screens.Menu
 
             buttons.OnSettings = () => settings?.ToggleVisibility();
             buttons.OnBeatmapListing = () => beatmapListing?.ToggleVisibility();
-            buttons.OnChart = () => rankings?.ShowSpotlights();
 
             LoadComponentAsync(background = new BackgroundScreenDefault());
             preloadSongSelect();