Fix gamepad start button not unpausing
This commit is contained in:
parent
255fc12aee
commit
582e934b80
|
@ -158,14 +158,14 @@
|
||||||
ControllerHandler.Update()
|
ControllerHandler.Update()
|
||||||
Controls.MakeMouseVisible()
|
Controls.MakeMouseVisible()
|
||||||
MouseHandler.Update()
|
MouseHandler.Update()
|
||||||
If KeyBoardHandler.KeyPressed(KeyBindings.EscapeKey) = True Or ControllerHandler.ButtonDown(Buttons.Start) = True Then
|
If KeyBoardHandler.KeyPressed(KeyBindings.EscapeKey) = True OrElse ControllerHandler.ButtonPressed(Buttons.Start) = True Then
|
||||||
CurrentScreen.EscapePressed()
|
CurrentScreen.EscapePressed()
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
|
|
||||||
CurrentScreen.Update()
|
CurrentScreen.Update()
|
||||||
If CurrentScreen.CanChat = True Then
|
If CurrentScreen.CanChat = True Then
|
||||||
If KeyBoardHandler.KeyPressed(KeyBindings.ChatKey) = True Or ControllerHandler.ButtonPressed(Buttons.RightShoulder) = True Then
|
If KeyBoardHandler.KeyPressed(KeyBindings.ChatKey) = True OrElse ControllerHandler.ButtonPressed(Buttons.RightShoulder) = True Then
|
||||||
If JoinServerScreen.Online = True Or Player.SandBoxMode = True Or GameController.IS_DEBUG_ACTIVE = True Then
|
If JoinServerScreen.Online = True Or Player.SandBoxMode = True Or GameController.IS_DEBUG_ACTIVE = True Then
|
||||||
SetScreen(New ChatScreen(CurrentScreen))
|
SetScreen(New ChatScreen(CurrentScreen))
|
||||||
End If
|
End If
|
||||||
|
|
|
@ -170,12 +170,12 @@
|
||||||
End Select
|
End Select
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If Controls.Dismiss() = True Or KeyBoardHandler.KeyPressed(KeyBindings.EscapeKey) = True And leftEscapeKey = True Or ControllerHandler.ButtonPressed(Buttons.Start) = True Then
|
If Controls.Dismiss() = True OrElse leftEscapeKey = True AndAlso (KeyBoardHandler.KeyPressed(KeyBindings.EscapeKey) = True OrElse ControllerHandler.ButtonPressed(Buttons.Start) = True) Then
|
||||||
SoundManager.PlaySound("select")
|
SoundManager.PlaySound("select")
|
||||||
ClickContinue()
|
ClickContinue()
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If KeyBoardHandler.KeyDown(KeyBindings.EscapeKey) = False And ControllerHandler.ButtonDown(Buttons.Start) = False Then
|
If KeyBoardHandler.KeyDown(KeyBindings.EscapeKey) = False And ControllerHandler.ButtonPressed(Buttons.Start) = False Then
|
||||||
Me.leftEscapeKey = True
|
Me.leftEscapeKey = True
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
Loading…
Reference in New Issue