X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_net.pas;h=98ca2ab33d8b0d31f15a1e6880f2301d576c5807;hb=7f57e4b195f1a553c5bb01638cc7d9908c992c88;hp=7c5de2a51f0418201e7e24678177a7e9e4ae8f14;hpb=a64e75f513d36924da087b8d68d725918b2639f8;p=d2df-sdl.git

diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index 7c5de2a..98ca2ab 100644
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
@@ -254,9 +254,9 @@ implementation
 
 uses
   SysUtils,
-  e_input, e_res,
+  e_input, e_res, g_options,
   g_nethandler, g_netmsg, g_netmaster, g_player, g_window, g_console,
-  g_main, g_game, g_language, g_weapons, ctypes, g_system, g_map;
+  g_game, g_language, g_weapons, ctypes, g_system, g_map;
 
 const
   FILE_CHUNK_SIZE = 8192;
@@ -273,7 +273,10 @@ begin
 end;
 
 procedure g_Net_InitLowLevel ();
+  var v: ENetVersion;
 begin
+  v := enet_linked_version();
+  e_LogWritefln('ENet Version: %s.%s.%s', [ENET_VERSION_GET_MAJOR(v), ENET_VERSION_GET_MINOR(v), ENET_VERSION_GET_PATCH(v)]);
   if enet_init_success then raise Exception.Create('wuta?!');
   enet_init_success := (enet_initialize() = 0);
 end;
@@ -1936,7 +1939,7 @@ begin
   end;
 
   // предупредить что ждем слишком долго через N секунд
-  TimeoutTime := sys_GetTicks() + NET_CONNECT_TIMEOUT;
+  TimeoutTime := GetTickCount64() + NET_CONNECT_TIMEOUT;
 
   OuterLoop := True;
   while OuterLoop do
@@ -1957,7 +1960,7 @@ begin
       end;
     end;
 
-    T := sys_GetTicks();
+    T := GetTickCount64();
     if T > TimeoutTime then
     begin
       TimeoutTime := T + NET_CONNECT_TIMEOUT * 100; // одного предупреждения хватит