added ForwardPorts config option

diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index 4e2ed9a09f94f868abff12ccccba327c435a3b6d..6d6be993ebc751a06046fae9e04a6bbffe618207 100644 (file)
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
@@ -1136,7 +1136,7 @@ begin
   NetPongForwarded := False;
   NetPortForwarded := 0;
 
-  DevList := upnpDiscover(2000, nil, nil, 0, 0, Addr(Err));
+  DevList := upnpDiscover(1000, nil, nil, 0, 0, Addr(Err));
   if DevList = nil then
   begin
     conwritefln('  upnpDiscover() failed: %d', [Err]);

diff --git a/src/game/g_options.pas b/src/game/g_options.pas
index 90effe0f8e8a3d343f131cc5a5e071817efedf83..c43da69ec21d1e7cc87a36027c559a288d225e37 100644 (file)
--- a/src/game/g_options.pas
+++ b/src/game/g_options.pas
@@ -252,6 +252,7 @@ begin
   end;
 
   NetUseMaster := True;
+  NetForwardPorts := False;
   g_Net_Slist_Set('mpms.doom2d.org', 25665);
 end;
 
@@ -510,6 +511,7 @@ begin
   NetUpdateRate := Max(0, config.ReadInt('Server', 'UpdateInterval', 0));
   NetRelupdRate := Max(0, config.ReadInt('Server', 'ReliableUpdateInterval', 18));
   NetMasterRate := Max(1, config.ReadInt('Server', 'MasterSyncInterval', 60000));
+  NetForwardPorts := config.ReadBool('Server', 'ForwardPorts', False);
 
 // Êëèåíò
   NetInterpLevel := Max(0, config.ReadInt('Client', 'InterpolationSteps', 2));
@@ -711,6 +713,7 @@ begin
   config.WriteBool('Server', 'RCON', NetAllowRCON);
   config.WriteStr ('Server', 'RCONPassword', NetRCONPassword);
   config.WriteBool('Server', 'SyncWithMaster', NetUseMaster);
+  config.WriteBool('Server', 'ForwardPorts', NetForwardPorts);
   config.WriteInt ('Server', 'UpdateInterval', NetUpdateRate);
   config.WriteInt ('Server', 'ReliableUpdateInterval', NetRelupdRate);
   config.WriteInt ('Server', 'MasterSyncInterval', NetMasterRate);
@@ -829,6 +832,7 @@ begin
   config.WriteInt ('Server', 'Port', NetPort);
   config.WriteInt ('Server', 'MaxClients', NetMaxClients);
   config.WriteBool('Server', 'SyncWithMaster', NetUseMaster);
+  config.WriteBool('Server', 'ForwardPorts', NetForwardPorts);
 
   config.SaveFile(FileName);
   config.Free();