From a06c5ec4ff5c640f37817e99d6ffcf52a47dd25f Mon Sep 17 00:00:00 2001
From: Harrison <yunyangdeng@gmail.com>
Date: Tue, 10 Sep 2019 21:30:07 -0400
Subject: [PATCH] fixed font names.

---
 RhythmBullet/Content/fonts/darktech_ldr.spritefont   | 2 +-
 RhythmBullet/Content/fonts/gasalt_regular.spritefont | 2 +-
 RhythmBullet/Content/fonts/iron_maiden.spritefont    | 2 +-
 RhythmBullet/Preferences/General.cs                  | 5 ++++-
 RhythmBullet/RhythmBulletGame.cs                     | 2 +-
 RhythmBullet/Screens/MainMenu/MainScreen.cs          | 1 -
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/RhythmBullet/Content/fonts/darktech_ldr.spritefont b/RhythmBullet/Content/fonts/darktech_ldr.spritefont
index 2455c85..6072751 100644
--- a/RhythmBullet/Content/fonts/darktech_ldr.spritefont
+++ b/RhythmBullet/Content/fonts/darktech_ldr.spritefont
@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>Darktech LDR</FontName>
+    <FontName>Darktech_ldr</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
diff --git a/RhythmBullet/Content/fonts/gasalt_regular.spritefont b/RhythmBullet/Content/fonts/gasalt_regular.spritefont
index abb738b..e516bfb 100644
--- a/RhythmBullet/Content/fonts/gasalt_regular.spritefont
+++ b/RhythmBullet/Content/fonts/gasalt_regular.spritefont
@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>Gasalt</FontName>
+    <FontName>gasalt_regular</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
diff --git a/RhythmBullet/Content/fonts/iron_maiden.spritefont b/RhythmBullet/Content/fonts/iron_maiden.spritefont
index 233cb91..df7c97e 100644
--- a/RhythmBullet/Content/fonts/iron_maiden.spritefont
+++ b/RhythmBullet/Content/fonts/iron_maiden.spritefont
@@ -11,7 +11,7 @@ with.
     <!--
     Modify this string to change the font that will be imported.
     -->
-    <FontName>Iron Maiden</FontName>
+    <FontName>iron_maiden</FontName>
 
     <!--
     Size is a float value, measured in points. Modify this value to change
diff --git a/RhythmBullet/Preferences/General.cs b/RhythmBullet/Preferences/General.cs
index 742adf7..0f9639f 100644
--- a/RhythmBullet/Preferences/General.cs
+++ b/RhythmBullet/Preferences/General.cs
@@ -1,11 +1,14 @@
 using RecrownedAthenaeum.SpecialTypes;
+using Microsoft.Xna.Framework.Graphics;
 using System;
 
 namespace RhythmBullet.Preferences
 {
     public class General
     {
-        public Resolution Resolution = new Resolution(1920, 1080);
+        public Resolution Resolution = new Resolution(
+            GraphicsAdapter.DefaultAdapter.CurrentDisplayMode.Width,
+            GraphicsAdapter.DefaultAdapter.CurrentDisplayMode.Height);
         public bool Fullscreen = false;
         public float MusicVolume = 1f;
         public float FXVolume = 1f;
diff --git a/RhythmBullet/RhythmBulletGame.cs b/RhythmBullet/RhythmBulletGame.cs
index 53b4e89..2523357 100644
--- a/RhythmBullet/RhythmBulletGame.cs
+++ b/RhythmBullet/RhythmBulletGame.cs
@@ -55,6 +55,7 @@ namespace RhythmBullet
             Resolution resolution = preferencesManager.GetPreferences<General>().Resolution;
             graphics.PreferredBackBufferWidth = resolution.Width;
             graphics.PreferredBackBufferHeight = resolution.Height;
+            
         }
 
         /// <summary>
@@ -188,7 +189,6 @@ namespace RhythmBullet
             assets.Queue<Texture2D>("cursor", false);
             assets.Queue<Texture2D>("title");
             assets.Queue<Texture2D>("default_cover", false);
-            assets.Queue<Texture2D>("backgrounds/mainBG");
             assets.Queue<TextureAtlas>("UI");
             assets.Queue<SpriteFont>("gasalt_regular");
             assets.Queue<SpriteFont>("darktech_ldr");
diff --git a/RhythmBullet/Screens/MainMenu/MainScreen.cs b/RhythmBullet/Screens/MainMenu/MainScreen.cs
index 5f29691..34cbbb3 100644
--- a/RhythmBullet/Screens/MainMenu/MainScreen.cs
+++ b/RhythmBullet/Screens/MainMenu/MainScreen.cs
@@ -22,7 +22,6 @@ namespace RhythmBullet.Screens.MainMenu
         public MainScreen(ContentManagerController assets, ISkin skin, Camera2D camera) : base(true)
         {
             this.assets = assets;
-            background = assets.Get<Texture2D>("backgrounds/mainBG");
             fat = new FadeAwayTransition(1.5f);
             book = new Book(assets, skin, camera);
             mainPage = new MainPage();