index 2e26b3a4911353ed68525980b511e80f984e2445..2ecad14c74378d27d7f666bf9c7dc01c39d792d8 100644 (file)
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
PingAddr: ENetAddress;
end;
pTNetServer = ^TNetServer;
+ TNetServerRow = record
+ Indices: Array of Integer;
+ Current: Integer;
+ end;
TNetServerList = array of TNetServer;
pTNetServerList = ^TNetServerList;
+ TNetServerTable = array of TNetServerRow;
var
- NetMHost: pENetHost = nil;
- NetMPeer: pENetPeer = nil;
-
slCurrent: TNetServerList = nil;
+ slTable: TNetServerTable = nil;
slWaitStr: string = '';
slReturnPressed: Boolean = True;
+ slMOTD: string = '';
+ slUrgent: string = '';
+
procedure g_Net_Slist_Set(IP: string; Port: Word);
function g_Net_Slist_Fetch(var SL: TNetServerList): Boolean;
-procedure g_Net_Slist_Update();
+procedure g_Net_Slist_Update (immediateSend: Boolean=true);
procedure g_Net_Slist_Remove();
-function g_Net_Slist_Connect(): Boolean;
+function g_Net_Slist_Connect(blocking: Boolean=True): Boolean;
procedure g_Net_Slist_Check();
-procedure g_Net_Slist_Disconnect();
+procedure g_Net_Slist_Disconnect (spamConsole: Boolean=true);
procedure g_Net_Slist_WriteInfo();
-procedure g_Serverlist_Draw(var SL: TNetServerList);
-procedure g_Serverlist_Control(var SL: TNetServerList);
+function g_Net_Slist_IsConnectionActive (): Boolean; // returns `false` if totally disconnected
+function g_Net_Slist_IsConnectionInProgress (): Boolean;
+
+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 GetTimerMS(): Int64;
+
implementation
uses
SysUtils, e_msg, 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, wadreader;
+ g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, g_basic,
+ wadreader, g_system;
var
- NetMEvent: ENetEvent;
- slSelection: Byte = 0;
- slFetched: Boolean = False;
- slDirPressed: Boolean = False;
+ NetMHost: pENetHost = nil;
+ NetMPeer: pENetPeer = nil;
+ NetMEvent: ENetEvent;
+ slSelection: Byte = 0;
+ slFetched: Boolean = False;
+ slDirPressed: Boolean = False;
+ slReadUrgent: Boolean = False;
+ // inside the game, calling `g_Net_Slist_Connect()` is disasterous, as it is blocking.
+ // so we'll use this variable to indicate if "connected" event is received.
+ NetHostConnected: Boolean = false;
+ NetHostConReqTime: Int64 = 0; // to timeout `connect`
+ NetUpdatePending: Boolean = false;
+
+
+function GetTimerMS (): Int64;
+begin
+ Result := sys_GetTicks() {div 1000};
+end;
-function GetTimerMS(): Int64;
+
+// returns `false` if totally disconnected
+function g_Net_Slist_IsConnectionActive (): Boolean;
+begin
+ result := (NetMHost <> nil) and (NetMPeer <> nil);
+end;
+
+
+function g_Net_Slist_IsConnectionInProgress (): Boolean;
begin
- Result := GetTimer() {div 1000};
+ if (NetMHost = nil) or (NetMPeer = nil) then begin result := false; exit; end;
+ result := (not NetHostConnected);
end;
+
+// should be called only if host/peer is here
+// returns `false` if not connected/dead
+function ProcessPendingConnection (): Boolean;
+var
+ ct: Int64;
+begin
+ result := false;
+ if (NetMHost = nil) or (NetMPeer = nil) then exit;
+ // are we waiting for connection?
+ if (not NetHostConnected) then
+ begin
+ // check for connection event
+ if (enet_host_service(NetMHost, @NetMEvent, 0) > 0) then
+ begin
+ if (NetMEvent.kind = ENET_EVENT_TYPE_CONNECT) then
+ begin
+ NetHostConnected := true;
+ if NetUpdatePending then g_Net_Slist_Update(false);
+ g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN]);
+ result := true;
+ exit;
+ end;
+ if (NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE) then enet_packet_destroy(NetMEvent.packet);
+ end;
+ // check for connection timeout
+ if (not NetHostConnected) then
+ begin
+ ct := GetTimerMS();
+ if (ct < NetHostConReqTime) or (ct-NetHostConReqTime >= 3000) then
+ begin
+ // 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);
+ g_Net_Slist_Disconnect(false);
+ end;
+ exit;
+ end;
+ end;
+ result := true;
+end;
+
+
procedure PingServer(var S: TNetServer; Sock: ENetSocket);
var
Buf: ENetBuffer;
InMsg: TMsg;
SvAddr: ENetAddress;
FromSL: Boolean;
+ MyVer, Str: string;
procedure ProcessLocal();
- var
- IPBuf: Array[0..19] of Byte;
begin
I := Length(SL);
SetLength(SL, I + 1);
with SL[I] do
begin
- FillChar(IPBuf, Length(IPBuf), 0);
- enet_address_get_host_ip(Addr(SvAddr.host), PChar(Addr(IPBuf)), Length(IPBuf));
- IP := PChar(Addr(IPBuf));
+ IP := DecodeIPV4(SvAddr.host);
Port := InMsg.ReadWord();
Ping := InMsg.ReadInt64();
Ping := GetTimerMS() - Ping;
NetOut.Clear();
NetOut.Write(Byte(NET_MMSG_GET));
+ // TODO: what should we identify the build with?
+ MyVer := GAME_VERSION;
+ NetOut.Write(MyVer);
+
P := enet_packet_create(NetOut.Data, NetOut.CurSize, Cardinal(ENET_PACKET_FLAG_RELIABLE));
enet_peer_send(NetMPeer, NET_MCHAN_MAIN, P);
enet_host_flush(NetMHost);
end;
end;
+ if InMsg.ReadCount < InMsg.CurSize then
+ begin
+ // new master, supports version reports
+ Str := InMsg.ReadString();
+ if (Str <> MyVer) then
+ begin
+ { TODO }
+ g_Console_Add('!!! UpdVer = `' + Str + '`');
+ end;
+ // even newer master, supports extra info
+ if InMsg.ReadCount < InMsg.CurSize then
+ begin
+ slMOTD := b_Text_Format(InMsg.ReadString());
+ Str := b_Text_Format(InMsg.ReadString());
+ // check if the message has updated and the user has to read it again
+ if slUrgent <> Str then slReadUrgent := False;
+ slUrgent := Str;
+ end;
+ end;
+
Result := True;
break;
end;
NetOut.Write(Byte(NetPassword <> ''));
end;
-procedure g_Net_Slist_Update;
-var
+procedure g_Net_Slist_Update (immediateSend: Boolean=true);
+var
P: pENetPacket;
-
begin
- if (NetMHost = nil) or (NetMPeer = nil) then Exit;
+ if not ProcessPendingConnection() then
+ begin
+ NetUpdatePending := g_Net_Slist_IsConnectionInProgress();
+ exit;
+ end;
+
+ NetUpdatePending := false;
NetOut.Clear();
NetOut.Write(Byte(NET_MMSG_UPD));
P := enet_packet_create(NetOut.Data, NetOut.CurSize, Cardinal(ENET_PACKET_FLAG_RELIABLE));
enet_peer_send(NetMPeer, NET_MCHAN_UPD, P);
- enet_host_flush(NetMHost);
+ if (immediateSend) then enet_host_flush(NetMHost);
NetOut.Clear();
end;
var
P: pENetPacket;
begin
- if (NetMHost = nil) or (NetMPeer = nil) then Exit;
+ if not ProcessPendingConnection() then exit;
+
NetOut.Clear();
NetOut.Write(Byte(NET_MMSG_DEL));
NetOut.Write(NetAddr.port);
NetOut.Clear();
end;
-function g_Net_Slist_Connect: Boolean;
+function g_Net_Slist_Connect (blocking: Boolean=True): Boolean;
+var
+ delay: Integer;
begin
Result := False;
+ if g_Net_Slist_IsConnectionActive then
+ begin
+ if not blocking then exit;
+ g_Net_Slist_Disconnect(false);
+ end;
+
+ NetHostConnected := False; // just in case
+ NetHostConReqTime := 0; // just in case
+ NetUpdatePending := false;
+
NetMHost := enet_host_create(nil, 1, NET_MCHANS, 0, 0);
if (NetMHost = nil) then
begin
Exit;
end;
- if (enet_host_service(NetMHost, @NetMEvent, 3000) > 0) then
+ if (blocking) then delay := 3000 else delay := 0;
+ if (enet_host_service(NetMHost, @NetMEvent, delay) > 0) then
if NetMEvent.kind = ENET_EVENT_TYPE_CONNECT then
begin
Result := True;
+ NetHostConnected := True;
g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_CONN]);
Exit;
end
if NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE then
enet_packet_destroy(NetMEvent.packet);
- g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True);
+ if (blocking) then
+ begin
+ g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True);
- NetMHost := nil;
- NetMPeer := nil;
+ if NetMPeer <> nil then enet_peer_reset(NetMPeer);
+ if NetMHost <> nil then enet_host_destroy(NetMHost);
+ NetMPeer := nil;
+ NetMHost := nil;
+ NetHostConnected := False;
+ NetHostConReqTime := 0;
+ NetUpdatePending := false;
+ end
+ else
+ begin
+ NetHostConReqTime := GetTimerMS();
+ g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_WCONN]);
+ end;
end;
-procedure g_Net_Slist_Disconnect;
+procedure g_Net_Slist_Disconnect (spamConsole: Boolean=true);
begin
if (NetMHost = nil) and (NetMPeer = nil) then Exit;
- if NetMode = NET_SERVER then g_Net_Slist_Remove;
+ if (NetMode = NET_SERVER) and (NetHostConnected) then g_Net_Slist_Remove;
enet_peer_disconnect(NetMPeer, 0);
enet_host_flush(NetMHost);
NetMPeer := nil;
NetMHost := nil;
+ NetHostConnected := False;
+ NetHostConReqTime := 0;
+ NetUpdatePending := false;
- g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]);
+ if (spamConsole) then g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]);
end;
procedure g_Net_Slist_Check;
begin
- if (NetMHost = nil) or (NetMPeer = nil) then Exit;
+ if not ProcessPendingConnection() then exit;
+
+ if (NetUpdatePending) then g_Net_Slist_Update(false);
while (enet_host_service(NetMHost, @NetMEvent, 0) > 0) do
begin
if NetMHost <> nil then enet_host_destroy(NetMHost);
NetMPeer := nil;
NetMHost := nil;
+ NetHostConnected := False;
+ NetHostConReqTime := 0;
+ NetUpdatePending := false;
Break;
end
else
end;
end;
-procedure g_Serverlist_Draw(var SL: TNetServerList);
+function GetServerFromTable(Index: Integer; SL: TNetServerList; ST: TNetServerTable): TNetServer;
+begin
+ Result.Number := 0;
+ Result.Protocol := 0;
+ Result.Name := '';
+ Result.IP := '';
+ Result.Port := 0;
+ Result.Map := '';
+ Result.Players := 0;
+ Result.MaxPlayers := 0;
+ Result.LocalPl := 0;
+ Result.Bots := 0;
+ Result.Ping := 0;
+ Result.GameMode := 0;
+ Result.Password := false;
+ FillChar(Result.PingAddr, SizeOf(ENetAddress), 0);
+ if ST = nil then
+ Exit;
+ if (Index < 0) or (Index >= Length(ST)) then
+ Exit;
+ Result := SL[ST[Index].Indices[ST[Index].Current]];
+end;
+
+procedure g_Serverlist_Draw(var SL: TNetServerList; var ST: TNetServerTable);
var
- sy, i, y, mw, mx, l: Integer;
+ Srv: TNetServer;
+ sy, i, y, mw, mx, l, motdh: Integer;
cw: Byte = 0;
ch: Byte = 0;
ww: Word = 0;
ip := _lc[I_NET_SLIST_HELP];
mw := (Length(ip) * cw) div 2;
- e_DrawFillQuad(16, 64, gScreenWidth-16, gScreenHeight-44, 64, 64, 64, 110);
- e_DrawQuad(16, 64, gScreenWidth-16, gScreenHeight-44, 255, 127, 0);
+ 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(16, 64, gScreenWidth-16, gScreenHeight-44, 64, 64, 64, 128);
+ 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,
end;
y := 90;
- if (slSelection < Length(SL)) then
+ if (slSelection < Length(ST)) then
begin
I := slSelection;
sy := y + 42 * I - 4;
- ip := _lc[I_NET_ADDRESS] + ' ' + SL[I].IP + ':' + IntToStr(SL[I].Port);
- if SL[I].Password then
+ 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(SL) > 0 then
+ if Length(ST) > 0 then
slSelection := 0;
mw := (gScreenWidth - 188);
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, gScreenHeight-64, gScreenWidth-16, gScreenHeight-64, 255, 127, 0);
+ e_DrawLine(1, 16, motdh-20, gScreenWidth-16, motdh-20, 255, 127, 0);
- e_DrawLine(1, mx - 70, 64, mx - 70, gScreenHeight-44, 255, 127, 0);
- e_DrawLine(1, mx, 64, mx, gScreenHeight-64, 255, 127, 0);
- e_DrawLine(1, mx + 52, 64, mx + 52, gScreenHeight-64, 255, 127, 0);
- e_DrawLine(1, mx + 104, 64, mx + 104, gScreenHeight-64, 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(SL) do
+ for I := 0 to High(ST) do
begin
- e_TextureFontPrintEx(18, y, SL[I].Name, gStdFont, 255, 255, 255, 1);
- e_TextureFontPrintEx(18, y + 16, SL[I].Map, gStdFont, 210, 210, 210, 1);
-
- y := y + 42;
- end;
+ 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);
- e_TextureFontPrintEx(mx - 68, 68, 'PING', gStdFont, 255, 127, 0, 1);
- y := 90;
- for I := 0 to High(SL) do
- begin
- if (SL[I].Ping < 0) or (SL[I].Ping > 999) then
+ // 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 SL[I].Ping = 0 then
+ 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(SL[I].Ping) + _lc[I_NET_SLIST_PING_MS], gStdFont, 255, 255, 255, 1);
+ e_TextureFontPrintEx(mx - 68, y, IntToStr(Srv.Ping) + _lc[I_NET_SLIST_PING_MS], gStdFont, 255, 255, 255, 1);
- y := y + 42;
- end;
+ if Length(ST[I].Indices) > 1 then
+ e_TextureFontPrintEx(mx - 68, y + 16, '< ' + IntToStr(Length(ST[I].Indices)) + ' >', gStdFont, 210, 210, 210, 1);
- e_TextureFontPrintEx(mx + 2, 68, 'MODE', gStdFont, 255, 127, 0, 1);
- y := 90;
- for I := 0 to High(SL) do
- begin
- e_TextureFontPrintEx(mx + 2, y, g_Game_ModeToText(SL[I].GameMode), gStdFont, 255, 255, 255, 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(mx + 54, 68, 'PLRS', gStdFont, 255, 127, 0, 1);
- y := 90;
- for I := 0 to High(SL) do
+ 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;
+
+procedure g_Serverlist_GenerateTable(SL: TNetServerList; var ST: TNetServerTable);
+var
+ i, j: Integer;
+
+ function FindServerInTable(Name: string): Integer;
+ var
+ i: Integer;
begin
- e_TextureFontPrintEx(mx + 54, y, IntToStr(SL[I].Players) + '/' + IntToStr(SL[I].MaxPlayers), gStdFont, 255, 255, 255, 1);
- e_TextureFontPrintEx(mx + 54, y + 16, IntToStr(SL[I].LocalPl) + '+' + IntToStr(SL[I].Bots), gStdFont, 210, 210, 210, 1);
- y := y + 42;
+ Result := -1;
+ if ST = nil then
+ Exit;
+ for i := Low(ST) to High(ST) do
+ begin
+ if Length(ST[i].Indices) = 0 then
+ continue;
+ if SL[ST[i].Indices[0]].Name = Name then
+ begin
+ Result := i;
+ Exit;
+ end;
+ end;
end;
-
- e_TextureFontPrintEx(mx + 106, 68, 'VER', gStdFont, 255, 127, 0, 1);
- y := 90;
- for I := 0 to High(SL) do
+ function ComparePing(i1, i2: Integer): Boolean;
+ var
+ p1, p2: Int64;
begin
- e_TextureFontPrintEx(mx + 106, y, IntToStr(SL[I].Protocol), gStdFont, 255, 255, 255, 1);
-
- y := y + 42;
+ p1 := SL[i1].Ping;
+ p2 := SL[i2].Ping;
+ if (p1 < 0) then p1 := 999;
+ if (p2 < 0) then p2 := 999;
+ Result := p1 > p2;
+ end;
+ procedure SortIndices(var ind: Array of Integer);
+ var
+ I, J: Integer;
+ T: Integer;
+ begin
+ for I := High(ind) downto Low(ind) do
+ for J := Low(ind) to High(ind) - 1 do
+ if ComparePing(ind[j], ind[j+1]) then
+ begin
+ T := ind[j];
+ ind[j] := ind[j+1];
+ ind[j+1] := T;
+ end;
+ end;
+ procedure SortRows();
+ var
+ I, J: Integer;
+ T: TNetServerRow;
+ begin
+ for I := High(ST) downto Low(ST) do
+ for J := Low(ST) to High(ST) - 1 do
+ if ComparePing(ST[j].Indices[0], ST[j+1].Indices[0]) then
+ begin
+ T := ST[j];
+ ST[j] := ST[j+1];
+ ST[j+1] := T;
+ end;
+ end;
+begin
+ ST := nil;
+ if SL = nil then
+ Exit;
+ for i := Low(SL) to High(SL) do
+ begin
+ j := FindServerInTable(SL[i].Name);
+ if j = -1 then
+ begin
+ j := Length(ST);
+ SetLength(ST, j + 1);
+ ST[j].Current := 0;
+ SetLength(ST[j].Indices, 1);
+ ST[j].Indices[0] := i;
+ end
+ else
+ begin
+ SetLength(ST[j].Indices, Length(ST[j].Indices) + 1);
+ ST[j].Indices[High(ST[j].Indices)] := i;
+ end;
end;
- e_TextureFontPrintEx(20, gScreenHeight-61, ip, gStdFont, 205, 205, 205, 1);
- ip := IntToStr(Length(SL)) + _lc[I_NET_SLIST_SERVERS];
- e_TextureFontPrintEx(gScreenWidth - 48 - (Length(ip) + 1)*cw,
- gScreenHeight-61, ip, gStdFont, 205, 205, 205, 1);
+ for i := Low(ST) to High(ST) do
+ SortIndices(ST[i].Indices);
+
+ SortRows();
end;
-procedure g_Serverlist_Control(var SL: TNetServerList);
+procedure g_Serverlist_Control(var SL: TNetServerList; var ST: TNetServerTable);
var
qm: Boolean;
+ Srv: TNetServer;
begin
if gConsoleShow or gChatShow then
Exit;
- qm := g_ProcessMessages(); // this updates kbd
+ qm := sys_HandleInput(); // this updates kbd
- if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) then
+ if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or
+ e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or
+ e_KeyPressed(JOY2_JUMP) or e_KeyPressed(JOY3_JUMP) then
begin
SL := nil;
+ ST := nil;
gState := STATE_MENU;
g_GUI_ShowWindow('MainMenu');
g_GUI_ShowWindow('NetGameMenu');
Exit;
end;
- if e_KeyPressed(IK_SPACE) or e_KeyPressed(VK_JUMP) then
+ // if there's a message on the screen,
+ if not slReadUrgent and (slUrgent <> '') then
+ begin
+ if e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN) or
+ e_KeyPressed(JOY0_ATTACK) or e_KeyPressed(JOY1_ATTACK) or e_KeyPressed(JOY2_ATTACK) or e_KeyPressed(JOY3_ATTACK) then
+ slReadUrgent := True;
+ Exit;
+ end;
+
+ if e_KeyPressed(IK_SPACE) or e_KeyPressed(VK_JUMP) or
+ e_KeyPressed(JOY0_ACTIVATE) or e_KeyPressed(JOY1_ACTIVATE) or e_KeyPressed(JOY2_ACTIVATE) or e_KeyPressed(JOY3_ACTIVATE) then
begin
if not slFetched then
begin
slWaitStr := _lc[I_NET_SLIST_WAIT];
g_Game_Draw;
- g_window.ReDrawWindow;
+ sys_Repaint;
if g_Net_Slist_Fetch(SL) then
begin
slWaitStr := _lc[I_NET_SLIST_ERROR];
slFetched := True;
slSelection := 0;
+ g_Serverlist_GenerateTable(SL, ST);
end;
end
else
if SL = nil then Exit;
- if e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN) then
+ if e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN) or
+ e_KeyPressed(JOY0_ATTACK) or e_KeyPressed(JOY1_ATTACK) or e_KeyPressed(JOY2_ATTACK) or e_KeyPressed(JOY3_ATTACK) then
begin
if not slReturnPressed then
begin
- if SL[slSelection].Password then
+ Srv := GetServerFromTable(slSelection, SL, ST);
+ if Srv.Password then
begin
- PromptIP := SL[slSelection].IP;
- PromptPort := SL[slSelection].Port;
+ PromptIP := Srv.IP;
+ PromptPort := Srv.Port;
gState := STATE_MENU;
g_GUI_ShowWindow('ClientPasswordMenu');
SL := nil;
+ ST := nil;
slReturnPressed := True;
Exit;
end
else
- g_Game_StartClient(SL[slSelection].IP, SL[slSelection].Port, '');
+ g_Game_StartClient(Srv.IP, Srv.Port, '');
SL := nil;
+ ST := nil;
slReturnPressed := True;
Exit;
end;
else
slReturnPressed := False;
- if e_KeyPressed(IK_DOWN) or e_KeyPressed(IK_KPDOWN) or e_KeyPressed(VK_DOWN) then
+ if e_KeyPressed(IK_DOWN) or e_KeyPressed(IK_KPDOWN) or e_KeyPressed(VK_DOWN) or
+ e_KeyPressed(JOY0_DOWN) or e_KeyPressed(JOY1_DOWN) or e_KeyPressed(JOY2_DOWN) or e_KeyPressed(JOY3_DOWN) then
begin
if not slDirPressed then
begin
Inc(slSelection);
- if slSelection > High(SL) then slSelection := 0;
+ if slSelection > High(ST) then slSelection := 0;
slDirPressed := True;
end;
end;
- if e_KeyPressed(IK_UP) or e_KeyPressed(IK_KPUP) or e_KeyPressed(VK_UP) then
+ if e_KeyPressed(IK_UP) or e_KeyPressed(IK_KPUP) or e_KeyPressed(VK_UP) or
+ e_KeyPressed(JOY0_UP) or e_KeyPressed(JOY1_UP) or e_KeyPressed(JOY2_UP) or e_KeyPressed(JOY3_UP) then
begin
if not slDirPressed then
begin
- if slSelection = 0 then slSelection := Length(SL);
+ if slSelection = 0 then slSelection := Length(ST);
Dec(slSelection);
slDirPressed := True;
end;
end;
- if (not e_KeyPressed(IK_DOWN)) and (not e_KeyPressed(IK_UP)) and (not e_KeyPressed(IK_KPDOWN)) and (not e_KeyPressed(IK_KPUP)) and (not e_KeyPressed(VK_DOWN)) and (not e_KeyPressed(VK_UP)) then
+ if e_KeyPressed(IK_RIGHT) or e_KeyPressed(IK_KPRIGHT) or e_KeyPressed(VK_RIGHT) or
+ e_KeyPressed(JOY0_RIGHT) or e_KeyPressed(JOY1_RIGHT) or e_KeyPressed(JOY2_RIGHT) or e_KeyPressed(JOY3_RIGHT) then
+ begin
+ if not slDirPressed then
+ begin
+ Inc(ST[slSelection].Current);
+ if ST[slSelection].Current > High(ST[slSelection].Indices) then ST[slSelection].Current := 0;
+ slDirPressed := True;
+ end;
+ end;
+
+ if e_KeyPressed(IK_LEFT) or e_KeyPressed(IK_KPLEFT) or e_KeyPressed(VK_LEFT) or
+ e_KeyPressed(JOY0_LEFT) or e_KeyPressed(JOY1_LEFT) or e_KeyPressed(JOY2_LEFT) or e_KeyPressed(JOY3_LEFT) then
+ begin
+ if not slDirPressed then
+ begin
+ if ST[slSelection].Current = 0 then ST[slSelection].Current := Length(ST[slSelection].Indices);
+ Dec(ST[slSelection].Current);
+
+ slDirPressed := True;
+ end;
+ end;
+
+ if (not e_KeyPressed(IK_DOWN)) and
+ (not e_KeyPressed(IK_UP)) and
+ (not e_KeyPressed(IK_RIGHT)) and
+ (not e_KeyPressed(IK_LEFT)) and
+ (not e_KeyPressed(IK_KPDOWN)) and
+ (not e_KeyPressed(IK_KPUP)) and
+ (not e_KeyPressed(IK_KPRIGHT)) and
+ (not e_KeyPressed(IK_KPLEFT)) and
+ (not e_KeyPressed(VK_DOWN)) and
+ (not e_KeyPressed(VK_UP)) and
+ (not e_KeyPressed(VK_RIGHT)) and
+ (not e_KeyPressed(VK_LEFT)) and
+ (not e_KeyPressed(JOY0_UP)) and (not e_KeyPressed(JOY1_UP)) and (not e_KeyPressed(JOY2_UP)) and (not e_KeyPressed(JOY3_UP)) and
+ (not e_KeyPressed(JOY0_DOWN)) and (not e_KeyPressed(JOY1_DOWN)) and (not e_KeyPressed(JOY2_DOWN)) and (not e_KeyPressed(JOY3_DOWN)) and
+ (not e_KeyPressed(JOY0_LEFT)) and (not e_KeyPressed(JOY1_LEFT)) and (not e_KeyPressed(JOY2_LEFT)) and (not e_KeyPressed(JOY3_LEFT)) and
+ (not e_KeyPressed(JOY0_RIGHT)) and (not e_KeyPressed(JOY1_RIGHT)) and (not e_KeyPressed(JOY2_RIGHT)) and (not e_KeyPressed(JOY3_RIGHT))
+ then
slDirPressed := False;
end;