removed redunant (second) protocol version

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

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 44135d789b46439e6216fdd08c879d2d2b66298e..0dab350037a061849ca1d69a9c5552f8a7006a32 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,8 +6,6 @@ interface
 uses g_net, g_triggers, Classes, SysUtils, md5;
 
 const
-  NET_PROTO_VERSION = 1;
-
   NET_MSG_INFO   = 100;
 
   NET_MSG_CHAT   = 101;
@@ -256,8 +255,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,
-  wadreader, MAPDEF;
+  g_language, g_monsters, g_netmaster, utils, wadreader, MAPDEF;
 
 const
   NET_KEY_LEFT     = 1;
@@ -312,10 +310,7 @@ var
   PID: Word;
   Color: TRGB;
   I: Integer;
-  ProtoVer, Zero: Byte;
 begin
-  Zero := e_Raw_Read_Byte(P);
-  ProtoVer := e_Raw_Read_Byte(P);
   Ver := e_Raw_Read_String(P);
   Pw := e_Raw_Read_String(P);
   PName := e_Raw_Read_String(P);
@@ -325,7 +320,7 @@ begin
   B := e_Raw_Read_Byte(P);
   T := e_Raw_Read_Byte(P);
 
-  if (Ver <> GAME_VERSION) or (ProtoVer <> NET_PROTO_VERSION) or (Zero <> 0) then
+  if Ver <> GAME_VERSION then
   begin
     g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
       _lc[I_NET_DISC_VERSION]);
@@ -2691,8 +2686,6 @@ begin
   e_Buffer_Clear(@NetOut);
 
   e_Buffer_Write(@NetOut, Byte(NET_MSG_INFO));
-  e_Buffer_Write(@NetOut, Byte(0)); // to kill old clients
-  e_Buffer_Write(@NetOut, Byte(NET_PROTO_VERSION));
   e_Buffer_Write(@NetOut, GAME_VERSION);
   e_Buffer_Write(@NetOut, Password);
   e_Buffer_Write(@NetOut, gPlayer1Settings.Name);
@@ -2845,7 +2838,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 +2851,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