Pause Screen Fixes + Indentation fix

- Fixed crash that occured when pausing the game during the old intro
- Fix weird indentation in warpblock.vb
This commit is contained in:
Jasper "JappaWakka" Speelman 2021-09-25 00:28:06 +02:00
parent fa435ae9f4
commit 86076944b2
3 changed files with 18 additions and 14 deletions

View File

@ -43,8 +43,8 @@
Screen.Level.WarpData.IsWarpBlock = True Screen.Level.WarpData.IsWarpBlock = True
Logger.Debug("Lock Camera") Logger.Debug("Lock Camera")
CType(Screen.Camera, OverworldCamera).YawLocked = True CType(Screen.Camera, OverworldCamera).YawLocked = True
Else Else
Screen.Level = New Level() Screen.Level = New Level()
Screen.Level.Load(Me.AdditionalValue.GetSplit(0)) Screen.Level.Load(Me.AdditionalValue.GetSplit(0))
Screen.Level.World.Initialize(Screen.Level.EnvironmentType, Screen.Level.WeatherType) Screen.Level.World.Initialize(Screen.Level.EnvironmentType, Screen.Level.WeatherType)

View File

@ -21,7 +21,7 @@
Me.ServerNames.Add(s.IdentifierName.ToLower()) Me.ServerNames.Add(s.IdentifierName.ToLower())
Next Next
Me.CanBePaused = True Me.CanBePaused = False
Me.CanChat = False Me.CanChat = False
Me.CanMuteMusic = False Me.CanMuteMusic = False
Me.MouseVisible = True Me.MouseVisible = True

View File

@ -25,17 +25,21 @@
If Core.Player.IsGameJoltSave = True Then If Core.Player.IsGameJoltSave = True Then
Me.canCreateAutosave = False Me.canCreateAutosave = False
Else Else
If Me.PreScreen IsNot Nothing AndAlso Camera.Name IsNot Nothing Then If Me.PreScreen IsNot Nothing Then
If Camera.Name <> "Overworld" Then If Camera Is Nothing Then
Me.canCreateAutosave = False Camera = New OverworldCamera()
Else ElseIf Camera.Name IsNot Nothing Then
Dim s As Screen = Me.PreScreen If Camera.Name <> "Overworld" Then
While s.Identification <> Identifications.OverworldScreen And Not s.PreScreen Is Nothing Me.canCreateAutosave = False
s = s.PreScreen Else
End While Dim s As Screen = Me.PreScreen
If s.Identification = Identifications.OverworldScreen Then While s.Identification <> Identifications.OverworldScreen And Not s.PreScreen Is Nothing
If CType(s, OverworldScreen).ActionScript.IsReady = False Then s = s.PreScreen
Me.canCreateAutosave = False End While
If s.Identification = Identifications.OverworldScreen Then
If CType(s, OverworldScreen).ActionScript.IsReady = False Then
Me.canCreateAutosave = False
End If
End If End If
End If End If
End If End If