Reserved key range for virtual keyboard + alternative virtkbd layout

[d2df-sdl.git] / src / game / g_net.pas

diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index 95f8f459b862c6a0253d699b0c89715040bcb1a6..b9f28b981c9bccac022b724867106534932cc390 100644 (file)
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
@@ -146,9 +146,10 @@ var
   NetPongForwarded: Boolean = False;
   NetIGDControl: AnsiString;
   NetIGDService: TURLStr;
-  NetPortThread: TThreadID = 0;
 {$ENDIF}
 
+  NetPortThread: TThreadID = 0;
+
   NetDumpFile: TStream;
 
 function  g_Net_Init(): Boolean;
@@ -815,7 +816,7 @@ begin
 
     ProcessLoading(true);
 
-    if e_KeyPressed(IK_ESCAPE) or e_KeyPressed(IK_SPACE) then
+    if e_KeyPressed(IK_ESCAPE) or e_KeyPressed(IK_SPACE) or e_KeyPressed(VK_ESCAPE) then
       OuterLoop := False;
   end;
 
@@ -978,7 +979,7 @@ begin
 
     ProcessLoading(true);
 
-    if e_KeyPressed(IK_ESCAPE) or e_KeyPressed(IK_SPACE) then
+    if e_KeyPressed(IK_ESCAPE) or e_KeyPressed(IK_SPACE) or e_KeyPressed(VK_ESCAPE) then
       break;
   end;
   Result := msgStream;
@@ -1144,7 +1145,7 @@ begin
   NetPongForwarded := False;
   NetPortForwarded := 0;
 
-  DevList := upnpDiscover(1000, nil, nil, 0, 0, Addr(Err));
+  DevList := upnpDiscover(1000, nil, nil, 0, 0, 2, Addr(Err));
   if DevList = nil then
   begin
     conwritefln('port forwarding failed: upnpDiscover() failed: %d', [Err]);