network: fixed server pings

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

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index ad92f47e300d3284a486787f57e293de45beebd0..7889180c1ba6f47893e58916f3154f2efc5ad043 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -1,3 +1,4 @@
+{$MODE DELPHI}
 unit g_netmsg;
 
 interface
@@ -5,7 +6,7 @@ interface
 uses g_net, g_triggers, Classes, SysUtils, md5;
 
 const
-  NET_PROTO_VERSION = 1;
+  NET_PROTO_VERSION = 2;
 
   NET_MSG_INFO   = 100;
 
@@ -256,8 +257,7 @@ uses
   Math, ENet, e_input, e_fixedbuffer, e_graphics, e_log,
   g_textures, g_gfx, g_sound, g_console, g_basic, g_options, g_main,
   g_game, g_player, g_map, g_panel, g_items, g_weapons, g_phys, g_gui,
-  g_language, g_monsters, g_netmaster, sfs,
-  WADEDITOR, MAPDEF;
+  g_language, g_monsters, g_netmaster, utils, wadreader, MAPDEF;
 
 const
   NET_KEY_LEFT     = 1;
@@ -2845,7 +2845,7 @@ end;
 
 function ReadFile(const FileName: TFileName): AByte;
 var
-  FileStream : TFileStream;
+  FileStream : TStream;
   fname: string;
 begin
   e_WriteLog(Format('NETWORK: looking for file "%s"', [FileName]), MSG_NOTIFY);
@@ -2858,7 +2858,7 @@ begin
   end;
   e_WriteLog(Format('NETWORK: found file "%s"', [fname]), MSG_NOTIFY);
   Result := nil;
-  FileStream:= TFileStream.Create(fname, fmOpenRead or {fmShareDenyWrite}fmShareDenyNone);
+  FileStream := openDiskFileRO(fname);
   try
     if FileStream.Size > 0 then
     begin