X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmsg.pas;h=9b0614dd1dede069f2297c84a61919fe5fbe3bc0;hb=83dba8e8957923e6a8f6541d7935345a59cf5bde;hp=9df97c1c1a39a33341cea5e18dc1b812dba9211f;hpb=423556f23c02a18964bd2c1e125516c0c902ca46;p=d2df-sdl.git

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 9df97c1..9b0614d 100644
--- 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;
@@ -311,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);
@@ -324,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]);
@@ -718,7 +714,7 @@ procedure MH_SEND_Info(ID: Byte);
 var
   Map: string;
 begin
-  g_ProcessResourceStr(gMapInfo.Map, nil, nil, @Map);
+  Map := g_ExtractFileName(gMapInfo.Map);
 
   e_Buffer_Clear(@NetOut);
 
@@ -2690,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);