From 531137c157c47f9ce1a09beeeb0790307d6fabb0 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Thu, 18 Aug 2022 14:55:52 +0200 Subject: [PATCH] Fix softlock when pausing during catching And a minor typo in the code --- P3D/Screens/Battle/BattleCatchScreen.vb | 2 +- P3D/Screens/MainMenu/PauseScreen.vb | 2 ++ P3D/Screens/Screen.vb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/P3D/Screens/Battle/BattleCatchScreen.vb b/P3D/Screens/Battle/BattleCatchScreen.vb index 7e3c79749..fd1c294ff 100644 --- a/P3D/Screens/Battle/BattleCatchScreen.vb +++ b/P3D/Screens/Battle/BattleCatchScreen.vb @@ -87,7 +87,7 @@ nextIndex: TextBox.Draw() End Sub - Private Sub UpdateAnimations() + Public Sub UpdateAnimations() Dim cIndex As Integer = 0 nextIndex: If AnimationList.Count > cIndex Then diff --git a/P3D/Screens/MainMenu/PauseScreen.vb b/P3D/Screens/MainMenu/PauseScreen.vb index 1488daff0..a12e03e0d 100644 --- a/P3D/Screens/MainMenu/PauseScreen.vb +++ b/P3D/Screens/MainMenu/PauseScreen.vb @@ -81,6 +81,8 @@ Public Overrides Sub Update() If PreScreen.Identification = Identifications.OverworldScreen Then Screen.Level.Update() + ElseIf PreScreen.Identification = Identifications.BattleCatchScreen Then + CType(PreScreen, BattleCatchScreen).UpdateAnimations() End If Screen.TextBox.reDelay = 0.0F diff --git a/P3D/Screens/Screen.vb b/P3D/Screens/Screen.vb index a0b48825e..40b762ce8 100644 --- a/P3D/Screens/Screen.vb +++ b/P3D/Screens/Screen.vb @@ -245,7 +245,7 @@ Public MustInherit Class Screen End Sub ''' - ''' The base update fucntion of a screen. + ''' The base update function of a screen. ''' ''' Contains no default code. Public Overridable Overloads Sub Update()