diff --git a/P3D/Screens/PC/HallOfFameScreen.vb b/P3D/Screens/PC/HallOfFameScreen.vb index c2bf0f896..3d8d61edf 100644 --- a/P3D/Screens/PC/HallOfFameScreen.vb +++ b/P3D/Screens/PC/HallOfFameScreen.vb @@ -6,6 +6,7 @@ Dim alpha As Integer = 255 Dim alphaFade As Integer = -1 Dim loadedLevel As Boolean = False + Dim backgroundLevel As String = "indigo\halloffame_interface.dat" Dim menuState As Integer = 0 Dim texture As Texture2D @@ -85,13 +86,15 @@ End Class - Public Sub New(ByVal currentScreen As Screen, ByVal i As Integer) + Public Sub New(ByVal currentScreen As Screen, ByVal i As Integer, Optional ByVal backgroundLevel As String = "indigo\halloffame_interface.dat") + Me.backgroundLevel = backgroundLevel SetupScreen(currentScreen) Me.Preselect = i Me.Cursor = Me.Preselect End Sub - Public Sub New(ByVal currentScreen As Screen) + Public Sub New(ByVal currentScreen As Screen, Optional ByVal backgroundLevel As String = "indigo\halloffame_interface.dat") + Me.backgroundLevel = backgroundLevel SetupScreen(currentScreen) End Sub @@ -143,7 +146,7 @@ Camera = New BattleSystem.BattleCamera() Level = New Level() - Level.Load("indigo\halloffame_interface.dat") + Level.Load(backgroundLevel) ResetCamera() Me.loadedLevel = True diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb index 57f440ac2..c5bd3f1cc 100644 --- a/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb +++ b/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb @@ -174,7 +174,15 @@ CanContinue = False Case "halloffame" If argument <> "" Then - Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New HallOfFameScreen(Core.CurrentScreen, int(argument)), Color.Black, False)) + If argument.Contains(",") = False Then + If StringHelper.IsNumeric(argument) Then + Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New HallOfFameScreen(Core.CurrentScreen, int(argument)), Color.Black, False)) + Else + Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New HallOfFameScreen(Core.CurrentScreen, argument), Color.Black, False)) + End If + Else + Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New HallOfFameScreen(Core.CurrentScreen, int(argument.GetSplit(0, ",")), argument.GetSplit(1, ",")), Color.Black, False)) + End If Else Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New HallOfFameScreen(Core.CurrentScreen), Color.Black, False)) End If