tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-26 23:34:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed PvP client not updating battle menu

Browse Source
This commit is contained in:
CaptainSegis 2016-10-24 17:26:06 -05:00
parent 183934927e
commit 900e2d38fd
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb
View File

@ -560,6 +560,10 @@
End Sub End Sub
Private Sub UpdateMainMenu(ByVal BattleScreen As BattleScreen) Private Sub UpdateMainMenu(ByVal BattleScreen As BattleScreen)
If BattleScreen.ClearMenuTime = True Then
_mainMenuItemList.Clear()
BattleScreen.ClearMenuTime = False
End If
If _mainMenuItemList.Count = 0 Then If _mainMenuItemList.Count = 0 Then
CreateMainMenuItems(BattleScreen) CreateMainMenuItems(BattleScreen)
End If End If
@ -570,10 +574,6 @@
End If End If
UpdateMenuOptions(_mainMenuIndex, _mainMenuNextIndex, _mainMenuItemList.Count) UpdateMenuOptions(_mainMenuIndex, _mainMenuNextIndex, _mainMenuItemList.Count)
If BattleScreen.ClearMenuTime = True Then
_mainMenuItemList.Clear()
BattleScreen.ClearMenuTime = False
End If
End Sub End Sub
Private Sub CreateMainMenuItems(ByVal BattleScreen As BattleScreen) Private Sub CreateMainMenuItems(ByVal BattleScreen As BattleScreen)

2
2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
View File

@ -823,6 +823,8 @@ nextIndex:
ClientWaitForData = False ClientWaitForData = False
ReceivedPokemonData = False ReceivedPokemonData = False
BattleMenu.Reset() BattleMenu.Reset()
ClearMenuTime = True
BattleMenu.Update(Me)
End If End If
End If End If
If Me.IsHost = False And Me.LockData <> "{}" And ReceivedPokemonData = False And ClientWaitForData = False And IsRemoteBattle = True Then If Me.IsHost = False And Me.LockData <> "{}" And ReceivedPokemonData = False And ClientWaitForData = False And IsRemoteBattle = True Then