diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index 099ab76f4f248319c002751bd5d6f864a5c98c8b..217825ea98184bec8fdafb7d9f6be59e90fc3339 100644 (file)
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
e_log, e_msg, ENet, Classes, md5, MAPDEF{$IFDEF USE_MINIUPNPC}, miniupnpc;{$ELSE};{$ENDIF}
const
e_log, e_msg, ENet, Classes, md5, MAPDEF{$IFDEF USE_MINIUPNPC}, miniupnpc;{$ELSE};{$ENDIF}
const
- NET_PROTOCOL_VER = 182;
+ NET_PROTOCOL_VER = 184;
NET_MAXCLIENTS = 24;
NET_CHANS = 12;
NET_MAXCLIENTS = 24;
NET_CHANS = 12;
exit;
end;
tf.diskName := findDiskWad(fname);
exit;
end;
tf.diskName := findDiskWad(fname);
- //if (length(tf.diskName) = 0) then tf.diskName := findDiskWad(GameDir+'/wads/'+fname);
if (length(tf.diskName) = 0) then
begin
e_LogWritefln('NETWORK: file "%s" not found!', [fname], TMsgType.Fatal);
if (length(tf.diskName) = 0) then
begin
e_LogWritefln('NETWORK: file "%s" not found!', [fname], TMsgType.Fatal);
// packet type
trans_omsg.Write(Byte(NTF_SERVER_MAP_INFO));
// map wad name
// packet type
trans_omsg.Write(Byte(NTF_SERVER_MAP_INFO));
// map wad name
- trans_omsg.Write(gGameSettings.WAD);
+ trans_omsg.Write(ExtractFileName(gGameSettings.WAD));
// map wad md5
trans_omsg.Write(md5);
// map wad size
// map wad md5
trans_omsg.Write(md5);
// map wad size
function g_Net_Client_Update(): enet_size_t;
begin
Result := 0;
function g_Net_Client_Update(): enet_size_t;
begin
Result := 0;
- while (enet_host_service(NetHost, @NetEvent, 0) > 0) do
+ while (NetHost <> nil) and (enet_host_service(NetHost, @NetEvent, 0) > 0) do
begin
case NetEvent.kind of
ENET_EVENT_TYPE_RECEIVE:
begin
case NetEvent.kind of
ENET_EVENT_TYPE_RECEIVE: