From 104a759e9f6f64d3bac30d239478f86be985116a Mon Sep 17 00:00:00 2001 From: Recrown Date: Sun, 13 Jan 2019 23:17:27 -0600 Subject: [PATCH] code adapting to refactors of RA and minor cleanup --- ...zontalVisualizer.cs => ReflectedHorizontalVisualizer.cs} | 0 RhythmBullet/RhythmBullet.csproj | 2 +- RhythmBullet/RhythmBulletGame.cs | 6 +++--- RhythmBullet/Screens/MainMenu/MainPage.cs | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) rename RhythmBullet/Audio/Visualizer/{HorizontalVisualizer.cs => ReflectedHorizontalVisualizer.cs} (100%) diff --git a/RhythmBullet/Audio/Visualizer/HorizontalVisualizer.cs b/RhythmBullet/Audio/Visualizer/ReflectedHorizontalVisualizer.cs similarity index 100% rename from RhythmBullet/Audio/Visualizer/HorizontalVisualizer.cs rename to RhythmBullet/Audio/Visualizer/ReflectedHorizontalVisualizer.cs diff --git a/RhythmBullet/RhythmBullet.csproj b/RhythmBullet/RhythmBullet.csproj index 84b2223..fe3e008 100644 --- a/RhythmBullet/RhythmBullet.csproj +++ b/RhythmBullet/RhythmBullet.csproj @@ -55,7 +55,7 @@ - + diff --git a/RhythmBullet/RhythmBulletGame.cs b/RhythmBullet/RhythmBulletGame.cs index 9b161f2..2fd29e9 100644 --- a/RhythmBullet/RhythmBulletGame.cs +++ b/RhythmBullet/RhythmBulletGame.cs @@ -86,7 +86,7 @@ namespace RecrownedAthenaeum spriteBatch = new SpriteBatch(GraphicsDevice); Camera = new Camera2D(graphics.GraphicsDevice); screenManager = new ScreenManager(graphics, Camera); - screenManager.RequireNextScreenEvent += RequireNextScreen; + screenManager.ShowFirstScreenEvent += ShowFirstScreen; QueueContent(); screenManager.Screen = new LoadingScreen(this, Content.Load("RhythmBullet"), 0.7f); } @@ -153,7 +153,7 @@ namespace RecrownedAthenaeum resizing = true; assets.UnloadAll(); QueueContent(); - screenManager.Resize(new LoadingScreen(this, Content.Load("loading_ring"), 0.4f)); + screenManager.Resize(new LoadingScreen(this, Content.Load("loading_ring"), 0.4f, true)); SetUpCursor(); } @@ -189,7 +189,7 @@ namespace RecrownedAthenaeum Mouse.SetCursor(MouseCursor.FromTexture2D(currentCursorTexture, currentCursorTexture.Width / 2, currentCursorTexture.Height / 2)); } - private void RequireNextScreen(Screen Screen) + private void ShowFirstScreen(Screen Screen) { Screen.NextScreen = mainScreen; } diff --git a/RhythmBullet/Screens/MainMenu/MainPage.cs b/RhythmBullet/Screens/MainMenu/MainPage.cs index 9fadad9..a9f00d4 100644 --- a/RhythmBullet/Screens/MainMenu/MainPage.cs +++ b/RhythmBullet/Screens/MainMenu/MainPage.cs @@ -17,6 +17,7 @@ namespace RecrownedAthenaeum.Screens.MainMenu { title = new Image(assets.Get("title")); AddModule(title); + } public override void ApplySize(int width, int height)