removed redunant (second) protocol version

diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index b8f957a32cfb32840360e0382db804f931611506..e0450ce5131996585a0bfca24731cd7209dee79f 100644 (file)
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
@@ -7,7 +7,7 @@ uses
   e_log, e_fixedbuffer, ENet, ENetTypes, ENetPlatform, Classes;
 
 const
-  NET_PROTOCOL_VER = 165;
+  NET_PROTOCOL_VER = 166;
 
   NET_MAXCLIENTS = 24;
   NET_CHANS = 11;

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 7889180c1ba6f47893e58916f3154f2efc5ad043..0dab350037a061849ca1d69a9c5552f8a7006a32 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -6,8 +6,6 @@ interface
 uses g_net, g_triggers, Classes, SysUtils, md5;
 
 const
-  NET_PROTO_VERSION = 2;
-
   NET_MSG_INFO   = 100;
 
   NET_MSG_CHAT   = 101;
@@ -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);