From 01db5bc9165a3b94dc13d7a0962d43fa0ed6e5e6 Mon Sep 17 00:00:00 2001 From: Ketmar Dark Date: Mon, 18 Apr 2016 19:36:50 +0300 Subject: [PATCH] removed redunant (second) protocol version --- src/game/g_net.pas | 2 +- src/game/g_netmsg.pas | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/game/g_net.pas b/src/game/g_net.pas index b8f957a..e0450ce 100644 --- 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 7889180..0dab350 100644 --- 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); -- 2.29.2