Start a random map on launch (#74)

mempler · Nov 2, 2021 · ff03c51 · ff03c51
1 parent 288da61
commit ff03c51
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/Qsor.Game/Graphics/UserInterface/Screens/MainMenu/MainMenuScreen.cs b/Qsor.Game/Graphics/UserInterface/Screens/MainMenu/MainMenuScreen.cs
@@ -58,7 +58,6 @@ private void Load(UpdaterOverlay updaterOverlay, AudioManager audioManager, Qsor
                 Origin = Anchor.Centre,
                 FillMode = FillMode.Fill,
             });
-            AddInternal(parallaxBack);
 
             _workingBeatmap.BindTo(beatmapManager.WorkingBeatmap);
             _workingBeatmap.ValueChanged += e =>
@@ -87,15 +86,22 @@ private void Load(UpdaterOverlay updaterOverlay, AudioManager audioManager, Qsor
                     Scale = new Vector2(1f) * (DrawSize.X / DrawSize.Y)
                 }
             });
-
-            AddInternal(parallaxFront);
 
-            AddInternal(_sideFlashes = new DrawableMenuSideFlashes());
-
-            AddInternal(_toolbar = new Toolbar());
-            AddInternal(_bottomBar = new BottomBar());
-
-            AddInternal(updaterOverlay);
+            InternalChildren = new Drawable[]
+            {
+                parallaxBack,
+                parallaxFront,
+
+                _sideFlashes = new DrawableMenuSideFlashes(),
+                _toolbar = new Toolbar(),
+                _bottomBar = new BottomBar(),
+
+                updaterOverlay
+            };
+
+            // Start a random map, TODO: remove this from here
+            beatmapManager.NextRandomMap();
+            beatmapManager.WorkingBeatmap.Value?.Play();
         }
 
         public override void OnEntering(IScreen last)

diff --git a/Qsor.Game/QsorGame.cs b/Qsor.Game/QsorGame.cs
@@ -25,6 +25,7 @@ private void Load()
 
             AddInternal(_keyBindingInputHandler = new GlobalKeyBindingInputHandler(this));
 
+
             if (!DebugUtils.IsDebugBuild)
             {
                 PushScreen(new IntroScreen());
@@ -42,7 +43,6 @@ private void Load()
             }
         }
 
-
         protected override bool OnKeyDown(KeyDownEvent e)
         {
             switch (e.Key)