index 393c4e572fc5191271ce324832860541376bfb79..d9c62c9efb78ea8821016e803d929bfac3e7a4c2 100644 (file)
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
NET_MMSG_DEL = 201;
NET_MMSG_GET = 202;
+const
+ // all timeouts in seconds
+ NMASTER_TIMEOUT_CONNECT = 3; // 3 seconds
+ NMASTER_TIMEOUT_RECONNECT = 5*60; // 5 minutes
+ //NMASTER_TIMEOUT_RECONNECT = 30; // 5 minutes
+ //NMASTER_FORCE_UPDATE_TIMEOUT = 20;
+ //NMASTER_FORCE_UPDATE_TIMEOUT = 0;
+
type
TNetServer = record
Number: Byte;
NetHostConnected: Boolean;
NetHostConReqTime: Int64; // to timeout `connect`; -1 means "waiting for shutdown"
NetUpdatePending: Boolean; // should we send an update after connection completes?
- lastConnectTime: Int64;
- updateSent: Boolean;
+ lastDisconnectTime: Int64; // last real disconnect time; <0: do not reconnect
+ updateSent: Boolean; // was at least one update sent? (used to decide if we should call `remove()`)
lastUpdateTime: Int64;
// server list request working flags
srvAnswered: Integer;
slReadUrgent: Boolean;
// temporary mark
justAdded: Boolean;
+ connectCount: Integer;
private
netmsg: TMsg;
slMOTD: AnsiString = '';
slUrgent: AnsiString = '';
+ NMASTER_FORCE_UPDATE_TIMEOUT: Integer = 0; // fuck you, fpc, and your idiotic "diagnostics"
+
-procedure g_Net_Slist_Set (IP: AnsiString; Port: Word; list: AnsiString='');
+procedure g_Net_Slist_Set (list: AnsiString);
function g_Net_Slist_Fetch (var SL: TNetServerList): Boolean;
// make this server private
procedure g_Net_Slist_ShutdownAll ();
procedure g_Serverlist_GenerateTable (SL: TNetServerList; var ST: TNetServerTable);
-procedure g_Serverlist_Draw (var SL: TNetServerList; var ST: TNetServerTable);
procedure g_Serverlist_Control (var SL: TNetServerList; var ST: TNetServerTable);
+function GetServerFromTable (Index: Integer; SL: TNetServerList; ST: TNetServerTable): TNetServer;
+
function GetTimerMS (): Int64;
+ var (* private state *)
+ slSelection: Byte = 0;
+ slReadUrgent: Boolean = False;
implementation
uses
e_input, e_graphics, e_log, g_window, g_net, g_console,
- g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, g_basic,
+ g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, g_basic, r_game,
wadreader, g_system, utils, hashtable;
NetMEvent: ENetEvent;
mlist: array of TMasterHost = nil;
- slSelection: Byte = 0;
slFetched: Boolean = False;
slDirPressed: Boolean = False;
- slReadUrgent: Boolean = False;
reportsEnabled: Boolean = true;
ct := GetTimerMS();
if (ct < stt) or (ct-stt >= 1500) then break;
+ // fuck! https://www.mail-archive.com/enet-discuss@cubik.org/msg00852.html
+ // tl;dr: on shitdows, we can get -1 sometimes, and it is *NOT* a failure.
+ // thank you, enet. let's ignore failures altogether then.
sres := enet_host_service(NetMHost, @NetMEvent, 100);
- if (sres < 0) then break;
- if (sres = 0) then continue;
+ // if (sres < 0) then break;
+ if (sres <= 0) then continue;
idx := findByPeer(NetMEvent.peer);
if (idx < 0) then
var
f: Integer;
begin
+ // set flags; pulse will take care of the rest
for f := 0 to High(mlist) do
begin
// force reconnect
- mlist[f].lastConnectTime := 0;
- //if (not mlist[f].isAlive()) then continue;
+ mlist[f].lastDisconnectTime := 0;
// force updating
if (sendUpdate) then
begin
var
f: Integer;
begin
+ // set flags; pulse will take care of the rest
for f := 0 to High(mlist) do
begin
if (not mlist[f].isAlive()) then continue;
NetHostConnected := false;
NetHostConReqTime := 0;
NetUpdatePending := false;
- lastConnectTime := 0;
+ lastDisconnectTime := 0;
updateSent := false;
lastUpdateTime := 0;
hostName := '';
slMOTD := '';
slUrgent := '';
slReadUrgent := true;
+ justAdded := false;
+ connectCount := 0;
netmsg.Alloc(NET_BUFSIZE);
setAddress(ea, '');
end;
if not isAlive() then exit;
if NetHostConnected then exit;
NetHostConnected := true;
+ NetHostConReqTime := 0; // just in case
e_LogWritefln('connected to master at [%s]', [hostName], TMsgType.Notify);
//g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN], [mlist[f].hostName]));
end;
//==========================================================================
//
-// TMasterHost.pulse
-//
-// this performs various scheduled tasks, if necessary
+// TMasterHost.disconnect
//
//==========================================================================
-procedure TMasterHost.pulse ();
-var
- ct: Int64;
- mrate: Cardinal;
+procedure TMasterHost.disconnect (forced: Boolean);
begin
- if not isAlive() then exit;
- if (NetHostConReqTime = -1) then exit; // waiting for shutdown (disconnect in progress)
- ct := GetTimerMS();
- // process pending connection timeout
- if (not NetHostConnected) then
+ if isAlive() then
begin
- if (ct < NetHostConReqTime) or (ct-NetHostConReqTime >= 3000) then
+ lastDisconnectTime := GetTimerMS();
+ if forced or (not NetHostConnected) or (NetHostConReqTime = -1) then
begin
- e_LogWritefln('failed to connect to master at [%s]', [hostName], TMsgType.Notify);
- // do not spam with error messages, it looks like the master is down
- //g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True);
- enet_peer_disconnect(peer, 0);
+ enet_peer_reset(peer);
+ peer := nil;
+ NetHostConReqTime := 0;
+ updateSent := false;
+ end
+ else
+ begin
+ enet_peer_disconnect_later(peer, 0);
// main pulse will take care of the rest
NetHostConReqTime := -1;
end;
- exit;
- end;
- // send update, if necessary
- if (NetUpdatePending) then
- begin
- mrate := NetMasterRate;
- if (mrate < 10000) then mrate := 10000
- else if (mrate > 1000*60*10) then mrate := 1000*60*10;
- if (lastUpdateTime = 0) or (ct < lastUpdateTime) or (ct-lastUpdateTime >= mrate) then
- begin
- lastUpdateTime := ct;
- update();
- end;
- end;
-end;
-
-
-//==========================================================================
-//
-// TMasterHost.disconnect
-//
-//==========================================================================
-procedure TMasterHost.disconnect (forced: Boolean);
-begin
- if not isAlive() then exit;
-
- if (forced) then
- begin
- enet_peer_reset(peer);
- peer := nil;
- NetHostConReqTime := 0;
end
else
begin
- enet_peer_disconnect_later(peer, 0);
- // main pulse will take care of the rest
- NetHostConReqTime := -1;
+ // just in case
+ NetHostConReqTime := 0;
+ updateSent := false;
end;
NetHostConnected := false;
NetUpdatePending := false;
- //updateSent := false;
lastUpdateTime := 0;
- //lastConnectTime := 0;
//if (spamConsole) then g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_DISC], [hostName]));
end;
if (NetHostConReqTime = -1) then
begin
disconnect(true);
+ if (NetHostConReqTime = -1) then e_LogWritefln('ketmar broke master [%s] logic! (000)', [hostName], TMsgType.Notify);
+ if (isAlive()) then e_LogWritefln('ketmar broke master [%s] logic! (001)', [hostName], TMsgType.Notify);
end
else
begin
if isAlive() then begin result := true; exit; end;
end;
- lastConnectTime := GetTimerMS();
+ lastDisconnectTime := GetTimerMS(); // why not?
SetLength(srvAnswer, 0);
srvAnswered := 0;
NetHostConnected := false;
NetUpdatePending := false;
updateSent := false;
lastUpdateTime := 0;
+ Inc(connectCount);
peer := enet_host_connect(NetMHost, @enetAddr, NET_MCHANS, 0);
if (peer = nil) then
exit;
end;
- NetHostConReqTime := lastConnectTime;
+ NetHostConReqTime := lastDisconnectTime;
e_LogWritefln('connecting to master at [%s]', [hostName], TMsgType.Notify);
end;
end;
+//==========================================================================
+//
+// TMasterHost.pulse
+//
+// this performs various scheduled tasks, if necessary
+//
+//==========================================================================
+procedure TMasterHost.pulse ();
+var
+ ct: Int64;
+ mrate: Cardinal;
+begin
+ if not isAlive() then exit;
+ if (NetHostConReqTime = -1) then exit; // waiting for shutdown (disconnect in progress)
+ ct := GetTimerMS();
+ // process pending connection timeout
+ if (not NetHostConnected) then
+ begin
+ if (ct < NetHostConReqTime) or (ct-NetHostConReqTime >= 1000*NMASTER_TIMEOUT_CONNECT) then
+ begin
+ e_LogWritefln('failed to connect to master at [%s]', [hostName], TMsgType.Notify);
+ // do not spam with error messages, it looks like the master is down
+ //g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True);
+ disconnect(true);
+ end;
+ exit;
+ end;
+ // send update, if necessary
+ if (NetUpdatePending) then
+ begin
+ mrate := NetMasterRate;
+ if (mrate < 10000) then mrate := 10000
+ else if (mrate > 1000*60*10) then mrate := 1000*60*10;
+ if (NMASTER_FORCE_UPDATE_TIMEOUT > 0) then mrate := NMASTER_FORCE_UPDATE_TIMEOUT*1000;
+ if (lastUpdateTime = 0) or (ct < lastUpdateTime) or (ct-lastUpdateTime >= mrate) then
+ begin
+ //e_LogWritefln('update timeout: %d', [Integer(mrate)], TMsgType.Notify);
+ lastUpdateTime := ct;
+ update();
+ end;
+ end;
+end;
+
+
//**************************************************************************
//
// other functions
// g_Net_Slist_Set
//
//==========================================================================
-procedure g_Net_Slist_Set (IP: AnsiString; Port: Word; list: AnsiString='');
+procedure g_Net_Slist_Set (list: AnsiString);
var
f, dest: Integer;
sa: AnsiString;
for f := 0 to High(mlist) do mlist[f].justAdded := false;
- IP := Trim(IP);
- if (length(IP) > 0) and (Port > 0) then
- begin
- sa := IP+':'+IntToStr(Port);
- if parseAddressPort(ea, sa) then addMasterRecord(ea, sa);
- end;
-
list := Trim(list);
//writeln('list=[', list, ']');
while (length(list) > 0) do
//
//**************************************************************************
+//==========================================================================
+//
+// isMasterReportsEnabled
+//
+//==========================================================================
+function isMasterReportsEnabled (): Boolean;
+begin
+ result := (reportsEnabled and g_Game_IsServer() and g_Game_IsNet() and NetUseMaster);
+end;
+
+
//==========================================================================
//
// g_Net_Slist_Pulse
sres: Integer;
idx: Integer;
ct: Int64;
+ isListQuery: Boolean;
+ count: Integer;
begin
if (not g_Net_IsNetworkAvailable()) then exit;
NetMHost := enet_host_create(nil, 64, NET_MCHANS, 1024*1024, 1024*1024);
if (NetMHost = nil) then
begin
- g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], True);
+ e_LogWriteln(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CLIENT] + ' (host_create)', TMsgType.Notify);
for f := 0 to High(mlist) do mlist[f].clear();
SetLength(mlist, 0);
Exit;
end;
end;
+ isListQuery := (timeout > 0);
ct := GetTimerMS();
+ // reconnect/disconnect/pulse for each master
for f := 0 to High(mlist) do
begin
if (not mlist[f].isValid()) then continue;
if (not mlist[f].isAlive()) then
begin
- if (timeout > 0) or (reportsEnabled and g_Game_IsServer() and g_Game_IsNet() and NetUseMaster) then
+ // not connected; try to reconnect if we're asking for a host list, or we are in netgame, and we are the host
+ if (not isListQuery) and isMasterReportsEnabled() then
begin
- if (mlist[f].lastConnectTime = 0) or (ct < mlist[f].lastConnectTime) or (ct-mlist[f].lastConnectTime >= 1000*60*5) then
+ if (mlist[f].lastDisconnectTime = 0) or (ct < mlist[f].lastDisconnectTime) or (ct-mlist[f].lastDisconnectTime >= 1000*NMASTER_TIMEOUT_RECONNECT) then
begin
e_LogWritefln('reconnecting to master [%s]', [mlist[f].hostName], TMsgType.Notify);
mlist[f].connect();
+ end
+ else
+ begin
+ //e_LogWritefln('DEAD master [%s]: ct=%d; ldt=%d; diff=%d', [mlist[f].hostName, Integer(ct), Integer(mlist[f].lastDisconnectTime), Integer(ct-mlist[f].lastDisconnectTime)], TMsgType.Notify);
end;
end;
end
else
begin
- if (timeout = 0) and (not reportsEnabled or not g_Game_IsServer() or not g_Game_IsNet() or not NetUseMaster) then
+ // if we're not in slist query, and not in netgame (or not a host), disconnect
+ if (not isListQuery) and (not isMasterReportsEnabled()) then
begin
if (mlist[f].isConnected()) and (mlist[f].updateSent) then
begin
e_LogWritefln('removing from master [%s]', [mlist[f].hostName], TMsgType.Notify);
mlist[f].remove();
end;
- //e_LogWritefln('disconnecting from master [%s]', [mlist[f].hostName], TMsgType.Notify);
+ e_LogWritefln('disconnecting from master [%s]', [mlist[f].hostName], TMsgType.Notify);
mlist[f].disconnect(false);
end;
end;
mlist[f].pulse();
end;
+ // fuck! https://www.mail-archive.com/enet-discuss@cubik.org/msg00852.html
+ // tl;dr: on shitdows, we can get -1 sometimes, and it is *NOT* a failure.
+ // thank you, enet. let's ignore failures altogether then.
+ count := 10; // no more than ten events in a row
sres := enet_host_service(NetMHost, @NetMEvent, timeout);
- while (sres <> 0) do
+ while (sres > 0) do
begin
+ {
if (sres < 0) then
begin
- g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], True);
+ e_LogWriteln(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CLIENT] + ' (host_service)', TMsgType.Notify);
for f := 0 to High(mlist) do mlist[f].clear();
SetLength(mlist, 0);
enet_host_destroy(NetMHost);
NetMHost := nil;
exit;
end;
+ }
idx := findByPeer(NetMEvent.peer);
if (idx < 0) then
enet_packet_destroy(NetMEvent.packet);
end;
end;
+
+ Dec(count);
+ if (count = 0) then break;
sres := enet_host_service(NetMHost, @NetMEvent, 0);
end;
end;
aliveCount: Integer;
hasUnanswered: Boolean;
stt, ct: Int64;
+ tmpsv: TNetServer;
begin
result := false;
SL := nil;
DisconnectAll(true); // forced disconnect
+ for f := 0 to High(mlist) do
+ begin
+ mlist[f].connectCount := 0;
+ mlist[f].srvAnswered := 0;
+ end;
+
NetOut.Clear();
NetOut.Write(Byte(NET_MMSG_GET));
if (not mlist[f].isValid()) then continue;
if (not mlist[f].isAlive()) then
begin
- mlist[f].connect();
- if (mlist[f].isAlive()) then
+ if (mlist[f].connectCount = 0) then
begin
- //g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_WCONN], [mlist[f].hostName]));
- hasUnanswered := true;
- stt := GetTimerMS();
+ mlist[f].connect();
+ if (mlist[f].isAlive()) then
+ begin
+ //g_Console_Add(Format(_lc[I_NET_MSG]+_lc[I_NET_SLIST_WCONN], [mlist[f].hostName]));
+ hasUnanswered := true;
+ stt := GetTimerMS();
+ end;
+ end
+ else if (mlist[f].srvAnswered > 1) then
+ begin
+ Inc(aliveCount);
end;
end
else if (mlist[f].isConnected()) then
else if (mlist[f].srvAnswered > 1) then
begin
Inc(aliveCount);
+ mlist[f].disconnect(false); // not forced
end;
end
else if (mlist[f].isConnecting()) then
if InMsg.ReadChar() <> 'D' then continue;
if InMsg.ReadChar() <> 'F' then continue;
+ with tmpsv do
+ begin
+ Port := InMsg.ReadWord();
+ Ping := InMsg.ReadInt64();
+ Ping := GetTimerMS() - Ping;
+ Name := InMsg.ReadString();
+ Map := InMsg.ReadString();
+ GameMode := InMsg.ReadByte();
+ Players := InMsg.ReadByte();
+ MaxPlayers := InMsg.ReadByte();
+ Protocol := InMsg.ReadByte();
+ Password := InMsg.ReadByte() = 1;
+ LocalPl := InMsg.ReadByte();
+ Bots := InMsg.ReadWord();
+ PingAddr := SvAddr;
+ end;
+
FromSL := False;
for I := Low(SL) to High(SL) do
if (SL[I].PingAddr.host = SvAddr.host) and
- (SL[I].PingAddr.port = SvAddr.port) then
+ (SL[I].PingAddr.port = SvAddr.port) and
+ (SL[I].Port = tmpsv.Port) and
+ (SL[I].Name = tmpsv.Name) then
begin
- with SL[I] do
- begin
- Port := InMsg.ReadWord();
- Ping := InMsg.ReadInt64();
- Ping := GetTimerMS() - Ping;
- Name := InMsg.ReadString();
- Map := InMsg.ReadString();
- GameMode := InMsg.ReadByte();
- Players := InMsg.ReadByte();
- MaxPlayers := InMsg.ReadByte();
- Protocol := InMsg.ReadByte();
- Password := InMsg.ReadByte() = 1;
- LocalPl := InMsg.ReadByte();
- Bots := InMsg.ReadWord();
- end;
+ tmpsv.IP := SL[I].IP;
+ SL[I] := tmpsv;
FromSL := True;
Inc(Cnt);
break;
end;
+
if not FromSL then
- ProcessLocal();
+ begin
+ I := Length(SL);
+ SetLength(SL, I + 1);
+ tmpsv.IP := DecodeIPV4(SvAddr.host);
+ SL[I] := tmpsv;
+ end;
end;
InMsg.Free();
end;
-//==========================================================================
-//
-// g_Serverlist_Draw
-//
-//==========================================================================
-procedure g_Serverlist_Draw (var SL: TNetServerList; var ST: TNetServerTable);
-var
- Srv: TNetServer;
- sy, i, y, mw, mx, l, motdh: Integer;
- cw: Byte = 0;
- ch: Byte = 0;
- ww: Word = 0;
- hh: Word = 0;
- ip: AnsiString;
-begin
- ip := '';
- sy := 0;
-
- e_CharFont_GetSize(gMenuFont, _lc[I_NET_SLIST], ww, hh);
- e_CharFont_Print(gMenuFont, (gScreenWidth div 2) - (ww div 2), 16, _lc[I_NET_SLIST]);
-
- e_TextureFontGetSize(gStdFont, cw, ch);
-
- ip := _lc[I_NET_SLIST_HELP];
- mw := (Length(ip) * cw) div 2;
-
- motdh := gScreenHeight - 49 - ch * b_Text_LineCount(slMOTD);
-
- e_DrawFillQuad(16, 64, gScreenWidth-16, motdh, 64, 64, 64, 110);
- e_DrawQuad(16, 64, gScreenWidth-16, motdh, 255, 127, 0);
-
- e_TextureFontPrintEx(gScreenWidth div 2 - mw, gScreenHeight-24, ip, gStdFont, 225, 225, 225, 1);
-
- // MOTD
- if slMOTD <> '' then
- begin
- e_DrawFillQuad(16, motdh, gScreenWidth-16, gScreenHeight-44, 64, 64, 64, 110);
- e_DrawQuad(16, motdh, gScreenWidth-16, gScreenHeight-44, 255, 127, 0);
- e_TextureFontPrintFmt(20, motdh + 3, slMOTD, gStdFont, False, True);
- end;
-
- // Urgent message
- if not slReadUrgent and (slUrgent <> '') then
- begin
- e_DrawFillQuad(17, 65, gScreenWidth-17, motdh-1, 64, 64, 64, 128);
- e_DrawFillQuad(gScreenWidth div 2 - 256, gScreenHeight div 2 - 60,
- gScreenWidth div 2 + 256, gScreenHeight div 2 + 60, 64, 64, 64, 128);
- e_DrawQuad(gScreenWidth div 2 - 256, gScreenHeight div 2 - 60,
- gScreenWidth div 2 + 256, gScreenHeight div 2 + 60, 255, 127, 0);
- e_DrawLine(1, gScreenWidth div 2 - 256, gScreenHeight div 2 - 40,
- gScreenWidth div 2 + 256, gScreenHeight div 2 - 40, 255, 127, 0);
- l := Length(_lc[I_NET_SLIST_URGENT]) div 2;
- e_TextureFontPrint(gScreenWidth div 2 - cw * l, gScreenHeight div 2 - 58,
- _lc[I_NET_SLIST_URGENT], gStdFont);
- l := Length(slUrgent) div 2;
- e_TextureFontPrintFmt(gScreenWidth div 2 - 253, gScreenHeight div 2 - 38,
- slUrgent, gStdFont, False, True);
- l := Length(_lc[I_NET_SLIST_URGENT_CONT]) div 2;
- e_TextureFontPrint(gScreenWidth div 2 - cw * l, gScreenHeight div 2 + 41,
- _lc[I_NET_SLIST_URGENT_CONT], gStdFont);
- e_DrawLine(1, gScreenWidth div 2 - 256, gScreenHeight div 2 + 40,
- gScreenWidth div 2 + 256, gScreenHeight div 2 + 40, 255, 127, 0);
- Exit;
- end;
-
- if SL = nil then
- begin
- l := Length(slWaitStr) div 2;
- e_DrawFillQuad(17, 65, gScreenWidth-17, motdh-1, 64, 64, 64, 128);
- e_DrawQuad(gScreenWidth div 2 - 192, gScreenHeight div 2 - 10,
- gScreenWidth div 2 + 192, gScreenHeight div 2 + 11, 255, 127, 0);
- e_TextureFontPrint(gScreenWidth div 2 - cw * l, gScreenHeight div 2 - ch div 2,
- slWaitStr, gStdFont);
- Exit;
- end;
-
- y := 90;
- if (slSelection < Length(ST)) then
- begin
- I := slSelection;
- sy := y + 42 * I - 4;
- Srv := GetServerFromTable(I, SL, ST);
- ip := _lc[I_NET_ADDRESS] + ' ' + Srv.IP + ':' + IntToStr(Srv.Port);
- if Srv.Password then
- ip := ip + ' ' + _lc[I_NET_SERVER_PASSWORD] + ' ' + _lc[I_MENU_YES]
- else
- ip := ip + ' ' + _lc[I_NET_SERVER_PASSWORD] + ' ' + _lc[I_MENU_NO];
- end else
- if Length(ST) > 0 then
- slSelection := 0;
-
- mw := (gScreenWidth - 188);
- mx := 16 + mw;
-
- e_DrawFillQuad(16 + 1, sy, gScreenWidth - 16 - 1, sy + 40, 64, 64, 64, 0);
- e_DrawLine(1, 16 + 1, sy, gScreenWidth - 16 - 1, sy, 205, 205, 205);
- e_DrawLine(1, 16 + 1, sy + 41, gScreenWidth - 16 - 1, sy + 41, 255, 255, 255);
-
- e_DrawLine(1, 16, 85, gScreenWidth - 16, 85, 255, 127, 0);
- e_DrawLine(1, 16, motdh-20, gScreenWidth-16, motdh-20, 255, 127, 0);
-
- e_DrawLine(1, mx - 70, 64, mx - 70, motdh, 255, 127, 0);
- e_DrawLine(1, mx, 64, mx, motdh-20, 255, 127, 0);
- e_DrawLine(1, mx + 52, 64, mx + 52, motdh-20, 255, 127, 0);
- e_DrawLine(1, mx + 104, 64, mx + 104, motdh-20, 255, 127, 0);
-
- e_TextureFontPrintEx(18, 68, 'NAME/MAP', gStdFont, 255, 127, 0, 1);
- e_TextureFontPrintEx(mx - 68, 68, 'PING', gStdFont, 255, 127, 0, 1);
- e_TextureFontPrintEx(mx + 2, 68, 'MODE', gStdFont, 255, 127, 0, 1);
- e_TextureFontPrintEx(mx + 54, 68, 'PLRS', gStdFont, 255, 127, 0, 1);
- e_TextureFontPrintEx(mx + 106, 68, 'VER', gStdFont, 255, 127, 0, 1);
-
- y := 90;
- for I := 0 to High(ST) do
- begin
- Srv := GetServerFromTable(I, SL, ST);
- // Name and map
- e_TextureFontPrintEx(18, y, Srv.Name, gStdFont, 255, 255, 255, 1);
- e_TextureFontPrintEx(18, y + 16, Srv.Map, gStdFont, 210, 210, 210, 1);
-
- // Ping and similar count
- if (Srv.Ping < 0) or (Srv.Ping > 999) then
- e_TextureFontPrintEx(mx - 68, y, _lc[I_NET_SLIST_NO_ACCESS], gStdFont, 255, 0, 0, 1)
- else
- if Srv.Ping = 0 then
- e_TextureFontPrintEx(mx - 68, y, '<1' + _lc[I_NET_SLIST_PING_MS], gStdFont, 255, 255, 255, 1)
- else
- e_TextureFontPrintEx(mx - 68, y, IntToStr(Srv.Ping) + _lc[I_NET_SLIST_PING_MS], gStdFont, 255, 255, 255, 1);
-
- if Length(ST[I].Indices) > 1 then
- e_TextureFontPrintEx(mx - 68, y + 16, '< ' + IntToStr(Length(ST[I].Indices)) + ' >', gStdFont, 210, 210, 210, 1);
-
- // Game mode
- e_TextureFontPrintEx(mx + 2, y, g_Game_ModeToText(Srv.GameMode), gStdFont, 255, 255, 255, 1);
-
- // Players
- e_TextureFontPrintEx(mx + 54, y, IntToStr(Srv.Players) + '/' + IntToStr(Srv.MaxPlayers), gStdFont, 255, 255, 255, 1);
- e_TextureFontPrintEx(mx + 54, y + 16, IntToStr(Srv.LocalPl) + '+' + IntToStr(Srv.Bots), gStdFont, 210, 210, 210, 1);
-
- // Version
- e_TextureFontPrintEx(mx + 106, y, IntToStr(Srv.Protocol), gStdFont, 255, 255, 255, 1);
-
- y := y + 42;
- end;
-
- e_TextureFontPrintEx(20, motdh-20+3, ip, gStdFont, 205, 205, 205, 1);
- ip := IntToStr(Length(ST)) + _lc[I_NET_SLIST_SERVERS];
- e_TextureFontPrintEx(gScreenWidth - 48 - (Length(ip) + 1)*cw,
- motdh-20+3, ip, gStdFont, 205, 205, 205, 1);
-end;
-
-
//==========================================================================
//
// g_Serverlist_GenerateTable
@@ -1713,7 +1641,7 @@ procedure g_Serverlist_GenerateTable (SL: TNetServerList; var ST: TNetServerTabl
var
i, j: Integer;
- function FindServerInTable(Name: AnsiString): Integer;
+ function FindServerInTable(Name: AnsiString; Port: Word): Integer;
var
i: Integer;
begin
begin
if Length(ST[i].Indices) = 0 then
continue;
- if SL[ST[i].Indices[0]].Name = Name then
+ if (SL[ST[i].Indices[0]].Name = Name) and (SL[ST[i].Indices[0]].Port = Port) then
begin
Result := i;
Exit;
ST := nil;
if SL = nil then
Exit;
+
for i := Low(SL) to High(SL) do
begin
- j := FindServerInTable(SL[i].Name);
+ j := FindServerInTable(SL[i].Name, SL[i].Port);
if j = -1 then
begin
j := Length(ST);
begin
slWaitStr := _lc[I_NET_SLIST_WAIT];
- g_Game_Draw;
+ r_Game_Draw;
sys_Repaint;
if g_Net_Slist_Fetch(SL) then