fixed exit from network related screens

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index b3c00635e29cf462295f45fcda3138c89d2f9414..26465349d5047fb6dc9de60e125f7607174d662f 100644 (file)
--- 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 953b430a5590cae3f9ef31e5351f0ef96d372eff..7e0f44d6eea0db1206c622dd7df555c4711a5ffe 100644 (file)
--- 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 957f53289ced17e4c8fbc0d7aa9169d4326e2dbe..723a364713e56432402cf0fdb6e29d9993232168 100644 (file)
--- 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;