diff --git a/P3D/Resources/ContentPackManager.vb b/P3D/Resources/ContentPackManager.vb index 3371428ea..5caf5ac53 100644 --- a/P3D/Resources/ContentPackManager.vb +++ b/P3D/Resources/ContentPackManager.vb @@ -84,9 +84,13 @@ Dim gameMode As GameMode = GameModeManager.ActiveGameMode If gameMode.ContentPath <> "\Content\" And gameMode.ContentPath <> "" Then - Dim gameModePath As String = GameController.GamePath & "\" & gameMode.ContentPath + Dim gameModePath As String = GameController.GamePath & gameMode.ContentPath For Each fileEnding As String In fileEndings.Split(CChar(",")) If System.IO.File.Exists(gameModePath & file & fileEnding) = True Then + Dim RootDirectory As String = gameMode.ContentPath.Remove(0, 1) + If RootDirectory.EndsWith("\") = True Then + RootDirectory = RootDirectory.Remove(RootDirectory.Length - 1, 1) + End If Return New ContentManager(Core.GameInstance.Services, gameMode.ContentPath.Remove(0, 1)) End If Next diff --git a/P3D/Resources/FontManager.vb b/P3D/Resources/FontManager.vb index 763a5cfc1..d62b67fb3 100644 --- a/P3D/Resources/FontManager.vb +++ b/P3D/Resources/FontManager.vb @@ -36,11 +36,11 @@ Public Class FontManager 'if there's a game mode loaded, look in that too for additional fonts If Not GameModeManager.ActiveGameMode.DirectoryName = "Kolben" Then If Not GameModeManager.ActiveGameMode.ContentPath = "\Content\" Then - If System.IO.Directory.Exists(GameController.GamePath & GameModeManager.ActiveGameMode.ContentPath & "\Fonts\BMP") = True Then - For Each s As String In System.IO.Directory.GetFiles(GameController.GamePath & GameModeManager.ActiveGameMode.ContentPath & "\Fonts\BMP") + If System.IO.Directory.Exists(GameController.GamePath & GameModeManager.ActiveGameMode.ContentPath & "Fonts\BMP") = True Then + For Each s As String In System.IO.Directory.GetFiles(GameController.GamePath & GameModeManager.ActiveGameMode.ContentPath & "Fonts\BMP") If s.EndsWith(".xnb") = True Then Dim name As String = s.Substring(0, s.Length - 4) - name = name.Substring(GameController.GamePath.Length + "\Fonts\BMP\".Length + GameModeManager.ActiveGameMode.ContentPath.Length) + name = name.Substring(GameController.GamePath.Length + "Fonts\BMP\".Length + GameModeManager.ActiveGameMode.ContentPath.Length) If FontList.ContainsKey(name.ToLower()) = False Then Dim font As SpriteFont = ContentPackManager.GetContentManager("Fonts\BMP\" & name, ".xnb").Load(Of SpriteFont)("Fonts\BMP\" & name) FontList.Add(name.ToLower(), New FontContainer(name, font)) diff --git a/P3D/Screens/MainMenu/PressStartScreen.vb b/P3D/Screens/MainMenu/PressStartScreen.vb index 4cbbebaf0..bd27133bf 100644 --- a/P3D/Screens/MainMenu/PressStartScreen.vb +++ b/P3D/Screens/MainMenu/PressStartScreen.vb @@ -1538,6 +1538,7 @@ Public Class NewMainMenuScreen If _gameModeExists Then GameModeManager.SetGameModePointer(_gameMode) Localization.ReloadGameModeTokens() + FontManager.LoadFonts() Water.ClearAnimationResources() Waterfall.ClearAnimationResources() Water.AddDefaultWaterAnimationResources() @@ -1744,8 +1745,8 @@ Public Class GameModeSelectionScreen End If If Controls.Accept(True, True, True) Then GameModeManager.SetGameModePointer(_gameModes(_index).DirectoryName) - Localization.ReloadGameModeTokens() + FontManager.LoadFonts() SoundManager.PlaySound("select") If GameModeManager.ActiveGameMode.IntroType = "0" Then SetScreen(New TransitionScreen(Me.PreScreen, New NewGameScreen(), Color.Black, False)) diff --git a/lib/P3D.ContentPipeline/Content/Fonts/BMP/InGame.png b/lib/P3D.ContentPipeline/Content/Fonts/BMP/InGame.png index acb0e3130..c1dc86f34 100644 Binary files a/lib/P3D.ContentPipeline/Content/Fonts/BMP/InGame.png and b/lib/P3D.ContentPipeline/Content/Fonts/BMP/InGame.png differ diff --git a/lib/P3D.ContentPipeline/Content/Fonts/BMP/TextFont.png b/lib/P3D.ContentPipeline/Content/Fonts/BMP/TextFont.png index 6186e69ce..cb10805a1 100644 Binary files a/lib/P3D.ContentPipeline/Content/Fonts/BMP/TextFont.png and b/lib/P3D.ContentPipeline/Content/Fonts/BMP/TextFont.png differ diff --git a/lib/P3D.ContentPipeline/Content/Fonts/BMP/chatFont.png b/lib/P3D.ContentPipeline/Content/Fonts/BMP/chatFont.png index acb0e3130..c1dc86f34 100644 Binary files a/lib/P3D.ContentPipeline/Content/Fonts/BMP/chatFont.png and b/lib/P3D.ContentPipeline/Content/Fonts/BMP/chatFont.png differ diff --git a/lib/P3D.ContentPipeline/Content/Fonts/BMP/mainFont.png b/lib/P3D.ContentPipeline/Content/Fonts/BMP/mainFont.png index acb0e3130..c1dc86f34 100644 Binary files a/lib/P3D.ContentPipeline/Content/Fonts/BMP/mainFont.png and b/lib/P3D.ContentPipeline/Content/Fonts/BMP/mainFont.png differ