tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix battlescreen interaction while in chatscreen

This commit is contained in:
JappaWakka 2023-08-04 10:15:18 +02:00
parent 5a7304c6fd
commit 6e8067b30b
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
P3D/Battle/BattleSystemV2/BattleMenu.vb
View File

@ -316,6 +316,12 @@
End Sub
Public Sub Update(ByRef BattleScreen As BattleScreen)
Dim blockinteractscreen() As Screen.Identifications = {Screen.Identifications.PartyScreen, Screen.Identifications.SummaryScreen, Screen.Identifications.PauseScreen, Screen.Identifications.ChatScreen}
If blockinteractscreen.Contains(Core.CurrentScreen.Identification) = True Then
CanInteract = False
Else
CanInteract = True
End If
If CanInteract = True Then
Select Case MenuState
Case MenuStates.Main

7
P3D/Battle/BattleSystemV2/BattleScreen.vb
View File

@ -1137,12 +1137,19 @@ nextIndex:
End If
End If
Dim canEnd As Boolean = True
Dim blockinteractscreen() As Screen.Identifications = {Screen.Identifications.PartyScreen, Screen.Identifications.SummaryScreen, Screen.Identifications.PauseScreen, Screen.Identifications.ChatScreen}
If blockinteractscreen.Contains(Core.CurrentScreen.Identification) = True Then
canEnd = False
End If
If canEnd = True Then
If GameController.IS_DEBUG_ACTIVE = True Or Core.Player.SandBoxMode = True Then
If KeyBoardHandler.KeyPressed(Keys.K) = True Then
Battle.Won = True
EndBattle(False)
End If
End If
End If
'Update the world:
Screen.Level.World.Initialize(Screen.Level.EnvironmentType, World.GetWeatherTypeFromWeather(Screen.Level.World.CurrentMapWeather))