diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index a88513acac78c6a4f5bcb799c91af45f2588e739..9df97c1c1a39a33341cea5e18dc1b812dba9211f 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
uses g_net, g_triggers, Classes, SysUtils, md5;
const
uses g_net, g_triggers, Classes, SysUtils, md5;
const
+ NET_PROTO_VERSION = 1;
+
NET_MSG_INFO = 100;
NET_MSG_CHAT = 101;
NET_MSG_INFO = 100;
NET_MSG_CHAT = 101;
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,
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,
- WADEDITOR, MAPDEF;
+ g_language, g_monsters, g_netmaster, utils, wadreader, MAPDEF;
const
NET_KEY_LEFT = 1;
const
NET_KEY_LEFT = 1;
PID: Word;
Color: TRGB;
I: Integer;
PID: Word;
Color: TRGB;
I: Integer;
+ ProtoVer, Zero: Byte;
begin
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);
Ver := e_Raw_Read_String(P);
Pw := e_Raw_Read_String(P);
PName := e_Raw_Read_String(P);
B := e_Raw_Read_Byte(P);
T := e_Raw_Read_Byte(P);
B := e_Raw_Read_Byte(P);
T := e_Raw_Read_Byte(P);
- if Ver <> GAME_VERSION then
+ if (Ver <> GAME_VERSION) or (ProtoVer <> NET_PROTO_VERSION) or (Zero <> 0) then
begin
g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
_lc[I_NET_DISC_VERSION]);
begin
g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_MSG_HOST_REJECT] +
_lc[I_NET_DISC_VERSION]);
e_Buffer_Clear(@NetOut);
e_Buffer_Write(@NetOut, Byte(NET_MSG_INFO));
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);
e_Buffer_Write(@NetOut, GAME_VERSION);
e_Buffer_Write(@NetOut, Password);
e_Buffer_Write(@NetOut, gPlayer1Settings.Name);
function ReadFile(const FileName: TFileName): AByte;
var
function ReadFile(const FileName: TFileName): AByte;
var
- FileStream : TFileStream;
+ FileStream : TStream;
+ fname: string;
begin
begin
+ e_WriteLog(Format('NETWORK: looking for file "%s"', [FileName]), MSG_NOTIFY);
+ fname := findDiskWad(FileName);
+ if length(fname) = 0 then
+ begin
+ e_WriteLog(Format('NETWORK: file "%s" not found!', [FileName]), MSG_FATALERROR);
+ SetLength(Result, 0);
+ exit;
+ end;
+ e_WriteLog(Format('NETWORK: found file "%s"', [fname]), MSG_NOTIFY);
Result := nil;
Result := nil;
- FileStream:= TFileStream.Create(FileName, fmOpenRead or fmShareDenyWrite);
+ FileStream := openDiskFileRO(fname);
try
try
- if FileStream.Size>0 then
+ if FileStream.Size > 0 then
begin
SetLength(Result, FileStream.Size);
FileStream.Read(Result[0], FileStream.Size);
begin
SetLength(Result, FileStream.Size);
FileStream.Read(Result[0], FileStream.Size);