From 9a8aeed521e9954c69b5a57c970766d8ca157b4c Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Wed, 10 Apr 2019 19:24:47 +0300 Subject: [PATCH] fixed exit from network related screens --- src/game/g_game.pas | 3 ++- src/game/g_net.pas | 6 ++++-- src/game/g_netmaster.pas | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/game/g_game.pas b/src/game/g_game.pas index b3c0063..2646534 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -4649,7 +4649,8 @@ begin ProcessLoading(true); - if e_KeyPressed(IK_SPACE) or e_KeyPressed(VK_ESCAPE) then + if e_KeyPressed(IK_SPACE) or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or + e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or e_KeyPressed(JOY2_JUMP) or e_KeyPressed(JOY3_JUMP) then begin State := 0; break; diff --git a/src/game/g_net.pas b/src/game/g_net.pas index 953b430..7e0f44d 100644 --- a/src/game/g_net.pas +++ b/src/game/g_net.pas @@ -822,7 +822,8 @@ begin ProcessLoading(true); - if e_KeyPressed(IK_SPACE) or e_KeyPressed(VK_ESCAPE) then + if e_KeyPressed(IK_SPACE) or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or + e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or e_KeyPressed(JOY2_JUMP) or e_KeyPressed(JOY3_JUMP) then OuterLoop := False; end; @@ -985,7 +986,8 @@ begin ProcessLoading(true); - if e_KeyPressed(IK_SPACE) or e_KeyPressed(VK_ESCAPE) then + if e_KeyPressed(IK_SPACE) or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or + e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or e_KeyPressed(JOY2_JUMP) or e_KeyPressed(JOY3_JUMP) then break; end; Result := msgStream; diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas index 957f532..723a364 100644 --- a/src/game/g_netmaster.pas +++ b/src/game/g_netmaster.pas @@ -707,7 +707,9 @@ begin qm := g_ProcessMessages(); // this updates kbd - if qm or e_KeyPressed(VK_ESCAPE) then + if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or + e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or + e_KeyPressed(JOY2_JUMP) or e_KeyPressed(JOY3_JUMP) then begin SL := nil; ST := nil; -- 2.29.2