index c5e792b585d7808dd105bb189feabff114e689b4..58667c978f15f1690d978e9c27d2993d279ca7df 100644 (file)
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
+(* Copyright (C) Doom 2D: Forever Developers
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *)
+{$INCLUDE ../shared/a_modes.inc}
unit g_netmaster;
interface
unit g_netmaster;
interface
PingAddr: ENetAddress;
end;
pTNetServer = ^TNetServer;
PingAddr: ENetAddress;
end;
pTNetServer = ^TNetServer;
+ TNetServerRow = record
+ Indices: Array of Integer;
+ Current: Integer;
+ end;
TNetServerList = array of TNetServer;
pTNetServerList = ^TNetServerList;
TNetServerList = array of TNetServer;
pTNetServerList = ^TNetServerList;
+ TNetServerTable = array of TNetServerRow;
var
NetMHost: pENetHost = nil;
NetMPeer: pENetPeer = nil;
slCurrent: TNetServerList = nil;
var
NetMHost: pENetHost = nil;
NetMPeer: pENetPeer = nil;
slCurrent: TNetServerList = nil;
+ slTable: TNetServerTable = nil;
slWaitStr: string = '';
slReturnPressed: Boolean = True;
slWaitStr: string = '';
slReturnPressed: Boolean = True;
procedure g_Net_Slist_Disconnect();
procedure g_Net_Slist_WriteInfo();
procedure g_Net_Slist_Disconnect();
procedure g_Net_Slist_WriteInfo();
-procedure g_Serverlist_Draw(var SL: TNetServerList);
-procedure g_Serverlist_Control(var SL: TNetServerList);
+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);
implementation
uses
implementation
uses
- SysUtils, e_fixedbuffer, e_input, e_graphics, e_log, g_window, g_net, g_console,
- g_map, g_game, g_sound, g_textures, g_gui, g_menu, g_options, g_language, wadreader,
- ENetPlatform;
+ 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;
var
NetMEvent: ENetEvent;
var
NetMEvent: ENetEvent;
enet_socket_send(Sock, Addr(S.PingAddr), @Buf, 1);
end;
enet_socket_send(Sock, Addr(S.PingAddr), @Buf, 1);
end;
+procedure PingBcast(Sock: ENetSocket);
+var
+ S: TNetServer;
+begin
+ S.IP := '255.255.255.255';
+ S.Port := NET_PING_PORT;
+ enet_address_set_host(Addr(S.PingAddr), PChar(Addr(S.IP[1])));
+ S.Ping := -1;
+ S.PingAddr.port := S.Port;
+ PingServer(S, Sock);
+end;
+
function g_Net_Slist_Fetch(var SL: TNetServerList): Boolean;
var
Cnt: Byte;
function g_Net_Slist_Fetch(var SL: TNetServerList): Boolean;
var
Cnt: Byte;
T: Int64;
Sock: ENetSocket;
Buf: ENetBuffer;
T: Int64;
Sock: ENetSocket;
Buf: ENetBuffer;
+ InMsg: TMsg;
SvAddr: ENetAddress;
SvAddr: ENetAddress;
+ FromSL: Boolean;
+
+ procedure ProcessLocal();
+ begin
+ I := Length(SL);
+ SetLength(SL, I + 1);
+ with SL[I] do
+ begin
+ IP := DecodeIPV4(SvAddr.host);
+ 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;
+ end;
+ procedure CheckLocalServers();
+ begin
+ SetLength(SL, 0);
+
+ Sock := enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM);
+ if Sock = ENET_SOCKET_NULL then Exit;
+ enet_socket_set_option(Sock, ENET_SOCKOPT_NONBLOCK, 1);
+ enet_socket_set_option(Sock, ENET_SOCKOPT_BROADCAST, 1);
+ PingBcast(Sock);
+
+ T := GetTimerMS();
+
+ InMsg.Alloc(NET_BUFSIZE);
+ Buf.data := InMsg.Data;
+ Buf.dataLength := InMsg.MaxSize;
+ while GetTimerMS() - T <= 500 do
+ begin
+ InMsg.Clear();
+
+ RX := enet_socket_receive(Sock, @SvAddr, @Buf, 1);
+ if RX <= 0 then continue;
+ InMsg.CurSize := RX;
+
+ InMsg.BeginReading();
+
+ if InMsg.ReadChar() <> 'D' then continue;
+ if InMsg.ReadChar() <> 'F' then continue;
+
+ ProcessLocal();
+ end;
+
+ InMsg.Free();
+ enet_socket_destroy(Sock);
+
+ if Length(SL) = 0 then SL := nil;
+ end;
begin
Result := False;
SL := nil;
if (NetMHost <> nil) or (NetMPeer <> nil) then
begin
Result := False;
SL := nil;
if (NetMHost <> nil) or (NetMPeer <> nil) then
+ begin
+ CheckLocalServers();
Exit;
Exit;
+ end;
if not g_Net_Slist_Connect then
if not g_Net_Slist_Connect then
+ begin
+ CheckLocalServers();
Exit;
Exit;
+ end;
- e_WriteLog('Fetching serverlist...', MSG_NOTIFY);
+ e_WriteLog('Fetching serverlist...', TMsgType.Notify);
g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_FETCH]);
g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_FETCH]);
- e_Buffer_Clear(@NetOut);
- e_Buffer_Write(@NetOut, Byte(NET_MMSG_GET));
+ NetOut.Clear();
+ NetOut.Write(Byte(NET_MMSG_GET));
- P := enet_packet_create(Addr(NetOut.Data), NetOut.Len, Cardinal(ENET_PACKET_FLAG_RELIABLE));
+ 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);
enet_peer_send(NetMPeer, NET_MCHAN_MAIN, P);
enet_host_flush(NetMHost);
begin
if NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE then
begin
begin
if NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE then
begin
- e_Raw_Seek(0);
- MID := e_Raw_Read_Byte(NetMEvent.packet^.data);
+ if not InMsg.Init(NetMEvent.packet^.data, NetMEvent.packet^.dataLength, True) then continue;
+
+ MID := InMsg.ReadByte();
if MID <> NET_MMSG_GET then continue;
if MID <> NET_MMSG_GET then continue;
- Cnt := e_Raw_Read_Byte(NetMEvent.packet^.data);
- e_WriteLog('Retrieved ' + IntToStr(Cnt) + ' server(s).', MSG_NOTIFY);
+ Cnt := InMsg.ReadByte();
g_Console_Add(_lc[I_NET_MSG] + Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt]), True);
if Cnt > 0 then
g_Console_Add(_lc[I_NET_MSG] + Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt]), True);
if Cnt > 0 then
for I := 0 to Cnt - 1 do
begin
SL[I].Number := I;
for I := 0 to Cnt - 1 do
begin
SL[I].Number := I;
- SL[I].IP := e_Raw_Read_String(NetMEvent.packet^.data);
- SL[I].Port := e_Raw_Read_Word(NetMEvent.packet^.data);
- SL[I].Name := e_Raw_Read_String(NetMEvent.packet^.data);
- SL[I].Map := e_Raw_Read_String(NetMEvent.packet^.data);
- SL[I].GameMode := e_Raw_Read_Byte(NetMEvent.packet^.data);
- SL[I].Players := e_Raw_Read_Byte(NetMEvent.packet^.data);
- SL[I].MaxPlayers := e_Raw_Read_Byte(NetMEvent.packet^.data);
- SL[I].Protocol := e_Raw_Read_Byte(NetMEvent.packet^.data);
- SL[I].Password := e_Raw_Read_Byte(NetMEvent.packet^.data) = 1;
+ SL[I].IP := InMsg.ReadString();
+ SL[I].Port := InMsg.ReadWord();
+ SL[I].Name := InMsg.ReadString();
+ SL[I].Map := InMsg.ReadString();
+ SL[I].GameMode := InMsg.ReadByte();
+ SL[I].Players := InMsg.ReadByte();
+ SL[I].MaxPlayers := InMsg.ReadByte();
+ SL[I].Protocol := InMsg.ReadByte();
+ SL[I].Password := InMsg.ReadByte() = 1;
enet_address_set_host(Addr(SL[I].PingAddr), PChar(Addr(SL[I].IP[1])));
SL[I].Ping := -1;
enet_address_set_host(Addr(SL[I].PingAddr), PChar(Addr(SL[I].IP[1])));
SL[I].Ping := -1;
- SL[I].PingAddr.port := SL[I].Port + 1;
+ SL[I].PingAddr.port := NET_PING_PORT;
end;
end;
end;
end;
end;
g_Net_Slist_Disconnect;
end;
g_Net_Slist_Disconnect;
- e_Buffer_Clear(@NetOut);
+ NetOut.Clear();
- if Length(SL) = 0 then Exit;
+ if Length(SL) = 0 then
+ begin
+ CheckLocalServers();
+ Exit;
+ end;
Sock := enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM);
if Sock = ENET_SOCKET_NULL then Exit;
Sock := enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM);
if Sock = ENET_SOCKET_NULL then Exit;
for I := Low(SL) to High(SL) do
PingServer(SL[I], Sock);
for I := Low(SL) to High(SL) do
PingServer(SL[I], Sock);
+ enet_socket_set_option(Sock, ENET_SOCKOPT_BROADCAST, 1);
+ PingBcast(Sock);
+
T := GetTimerMS();
T := GetTimerMS();
- e_Buffer_Clear(@NetIn);
- Buf.data := Addr(NetIn.Data);
- Buf.dataLength := Length(NetIn.Data);
+ InMsg.Alloc(NET_BUFSIZE);
+ Buf.data := InMsg.Data;
+ Buf.dataLength := InMsg.MaxSize;
Cnt := 0;
Cnt := 0;
- while Cnt < Length(SL) do
+ while GetTimerMS() - T <= 500 do
begin
begin
- if GetTimerMS() - T > 500 then break;
-
- e_Buffer_Clear(@NetIn);
+ InMsg.Clear();
RX := enet_socket_receive(Sock, @SvAddr, @Buf, 1);
if RX <= 0 then continue;
RX := enet_socket_receive(Sock, @SvAddr, @Buf, 1);
if RX <= 0 then continue;
- NetIn.Len := RX + 1;
- NetIn.ReadPos := 0;
+ InMsg.CurSize := RX;
- if e_Buffer_Read_Char(@NetIn) <> 'D' then continue;
- if e_Buffer_Read_Char(@NetIn) <> 'F' then continue;
+ InMsg.BeginReading();
+ if InMsg.ReadChar() <> 'D' then continue;
+ if InMsg.ReadChar() <> 'F' then continue;
+
+ 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
begin
with SL[I] do
begin
for I := Low(SL) to High(SL) do
if (SL[I].PingAddr.host = SvAddr.host) and
(SL[I].PingAddr.port = SvAddr.port) then
begin
with SL[I] do
begin
- Ping := e_Buffer_Read_Int64(@NetIn);
+ Port := InMsg.ReadWord();
+ Ping := InMsg.ReadInt64();
Ping := GetTimerMS() - Ping;
Ping := GetTimerMS() - Ping;
- Name := e_Buffer_Read_String(@NetIn);
- Map := e_Buffer_Read_String(@NetIn);
- GameMode := e_Buffer_Read_Byte(@NetIn);
- Players := e_Buffer_Read_Byte(@NetIn);
- MaxPlayers := e_Buffer_Read_Byte(@NetIn);
- Protocol := e_Buffer_Read_Byte(@NetIn);
- Password := e_Buffer_Read_Byte(@NetIn) = 1;
- LocalPl := e_Buffer_Read_Byte(@NetIn);
- Bots := e_Buffer_Read_Word(@NetIn);
+ 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;
end;
+ FromSL := True;
Inc(Cnt);
break;
end;
Inc(Cnt);
break;
end;
+ if not FromSL then
+ ProcessLocal();
end;
end;
+ InMsg.Free();
enet_socket_destroy(Sock);
end;
enet_socket_destroy(Sock);
end;
Wad, Map: string;
Cli: Byte;
begin
Wad, Map: string;
Cli: Byte;
begin
- g_ProcessResourceStr(gMapInfo.Map, @Wad, nil, @Map);
- Wad := ExtractFileName(Wad);
+ Wad := g_ExtractWadNameNoPath(gMapInfo.Map);
+ Map := g_ExtractFileName(gMapInfo.Map);
- e_Buffer_Write(@NetOut, NetServerName);
+ NetOut.Write(NetServerName);
- e_Buffer_Write(@NetOut, Wad + ':\' + Map);
- e_Buffer_Write(@NetOut, gGameSettings.GameMode);
+ NetOut.Write(Wad + ':\' + Map);
+ NetOut.Write(gGameSettings.GameMode);
Cli := NetClientCount;
Cli := NetClientCount;
- e_Buffer_Write(@NetOut, Cli);
+ NetOut.Write(Cli);
- e_Buffer_Write(@NetOut, NetMaxClients);
+ NetOut.Write(NetMaxClients);
- e_Buffer_Write(@NetOut, Byte(NET_PROTOCOL_VER));
- e_Buffer_Write(@NetOut, Byte(NetPassword <> ''));
+ NetOut.Write(Byte(NET_PROTOCOL_VER));
+ NetOut.Write(Byte(NetPassword <> ''));
end;
procedure g_Net_Slist_Update;
end;
procedure g_Net_Slist_Update;
begin
if (NetMHost = nil) or (NetMPeer = nil) then Exit;
begin
if (NetMHost = nil) or (NetMPeer = nil) then Exit;
- e_Buffer_Clear(@NetOut);
- e_Buffer_Write(@NetOut, Byte(NET_MMSG_UPD));
- e_Buffer_Write(@NetOut, NetAddr.port);
+ NetOut.Clear();
+ NetOut.Write(Byte(NET_MMSG_UPD));
+ NetOut.Write(NetAddr.port);
g_Net_Slist_WriteInfo();
g_Net_Slist_WriteInfo();
- P := enet_packet_create(Addr(NetOut.Data), NetOut.Len, Cardinal(ENET_PACKET_FLAG_RELIABLE));
+ 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);
enet_peer_send(NetMPeer, NET_MCHAN_UPD, P);
enet_host_flush(NetMHost);
- e_Buffer_Clear(@NetOut);
+ NetOut.Clear();
end;
procedure g_Net_Slist_Remove;
end;
procedure g_Net_Slist_Remove;
P: pENetPacket;
begin
if (NetMHost = nil) or (NetMPeer = nil) then Exit;
P: pENetPacket;
begin
if (NetMHost = nil) or (NetMPeer = nil) then Exit;
- e_Buffer_Clear(@NetOut);
- e_Buffer_Write(@NetOut, Byte(NET_MMSG_DEL));
- e_Buffer_Write(@NetOut, NetAddr.port);
+ NetOut.Clear();
+ NetOut.Write(Byte(NET_MMSG_DEL));
+ NetOut.Write(NetAddr.port);
- P := enet_packet_create(Addr(NetOut.Data), NetOut.Len, Cardinal(ENET_PACKET_FLAG_RELIABLE));
+ 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);
enet_peer_send(NetMPeer, NET_MCHAN_MAIN, P);
enet_host_flush(NetMHost);
- e_Buffer_Clear(@NetOut);
+ NetOut.Clear();
end;
function g_Net_Slist_Connect: Boolean;
end;
function g_Net_Slist_Connect: Boolean;
begin
enet_address_set_host(@NetSlistAddr, PChar(Addr(IP[1])));
NetSlistAddr.Port := Port;
begin
enet_address_set_host(@NetSlistAddr, PChar(Addr(IP[1])));
NetSlistAddr.Port := Port;
- e_WriteLog('Masterserver address set to ' + IP + ':' + IntToStr(Port), MSG_NOTIFY);
+ e_WriteLog('Masterserver address set to ' + IP + ':' + IntToStr(Port), TMsgType.Notify);
end;
end;
end;
end;
-procedure g_Serverlist_Draw(var SL: TNetServerList);
+function GetServerFromTable(Index: Integer; SL: TNetServerList; ST: TNetServerTable): TNetServer;
+begin
+ 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
var
+ Srv: TNetServer;
sy, i, y, mw, mx, l: Integer;
sy, i, y, mw, mx, l: Integer;
- cw, ch: Byte;
- ww, hh: Word;
+ cw: Byte = 0;
+ ch: Byte = 0;
+ ww: Word = 0;
+ hh: Word = 0;
ip: string;
begin
ip := '';
ip: string;
begin
ip := '';
end;
y := 90;
end;
y := 90;
- if (slSelection < Length(SL)) then
+ if (slSelection < Length(ST)) then
begin
I := slSelection;
sy := y + 42 * I - 4;
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
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);
slSelection := 0;
mw := (gScreenWidth - 188);
e_DrawLine(1, mx + 104, 64, mx + 104, gScreenHeight-64, 255, 127, 0);
e_TextureFontPrintEx(18, 68, 'NAME/MAP', gStdFont, 255, 127, 0, 1);
e_DrawLine(1, mx + 104, 64, mx + 104, gScreenHeight-64, 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;
y := 90;
- for I := 0 to High(SL) do
+ for I := 0 to High(ST) do
begin
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);
+ 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);
- y := y + 42;
- end;
-
- 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
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, '<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);
-
- y := y + 42;
- end;
+ e_TextureFontPrintEx(mx - 68, y, IntToStr(Srv.Ping) + _lc[I_NET_SLIST_PING_MS], gStdFont, 255, 255, 255, 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);
+ if Length(ST[I].Indices) > 1 then
+ e_TextureFontPrintEx(mx - 68, y + 16, '< ' + IntToStr(Length(ST[I].Indices)) + ' >', gStdFont, 210, 210, 210, 1);
- y := y + 42;
- end;
+ // Game mode
+ e_TextureFontPrintEx(mx + 2, y, g_Game_ModeToText(Srv.GameMode), gStdFont, 255, 255, 255, 1);
- e_TextureFontPrintEx(mx + 54, 68, 'PLRS', gStdFont, 255, 127, 0, 1);
- y := 90;
- for I := 0 to High(SL) do
- 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;
- end;
+ // 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);
- e_TextureFontPrintEx(mx + 106, 68, 'VER', gStdFont, 255, 127, 0, 1);
- y := 90;
- for I := 0 to High(SL) do
- begin
- e_TextureFontPrintEx(mx + 106, y, IntToStr(SL[I].Protocol), gStdFont, 255, 255, 255, 1);
+ // Version
+ e_TextureFontPrintEx(mx + 106, y, IntToStr(Srv.Protocol), gStdFont, 255, 255, 255, 1);
y := y + 42;
end;
e_TextureFontPrintEx(20, gScreenHeight-61, ip, gStdFont, 205, 205, 205, 1);
y := y + 42;
end;
e_TextureFontPrintEx(20, gScreenHeight-61, ip, gStdFont, 205, 205, 205, 1);
- ip := IntToStr(Length(SL)) + _lc[I_NET_SLIST_SERVERS];
+ ip := IntToStr(Length(ST)) + _lc[I_NET_SLIST_SERVERS];
e_TextureFontPrintEx(gScreenWidth - 48 - (Length(ip) + 1)*cw,
gScreenHeight-61, ip, gStdFont, 205, 205, 205, 1);
end;
e_TextureFontPrintEx(gScreenWidth - 48 - (Length(ip) + 1)*cw,
gScreenHeight-61, ip, gStdFont, 205, 205, 205, 1);
end;
-procedure g_Serverlist_Control(var SL: TNetServerList);
+procedure g_Serverlist_GenerateTable(SL: TNetServerList; var ST: TNetServerTable);
+var
+ i, j: Integer;
+
+ function FindServerInTable(Name: string): Integer;
+ var
+ i: Integer;
+ begin
+ 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;
+ function ComparePing(i1, i2: Integer): Boolean;
+ var
+ p1, p2: Int64;
+ begin
+ 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;
+
+ for i := Low(ST) to High(ST) do
+ SortIndices(ST[i].Indices);
+
+ SortRows();
+end;
+
+procedure g_Serverlist_Control(var SL: TNetServerList; var ST: TNetServerTable);
+var
+ qm: Boolean;
+ Srv: TNetServer;
begin
if gConsoleShow or gChatShow then
Exit;
begin
if gConsoleShow or gChatShow then
Exit;
- e_PollInput();
+ qm := g_ProcessMessages(); // this updates kbd
- if e_KeyPressed(IK_ESCAPE) then
+ if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) then
begin
SL := nil;
begin
SL := nil;
+ ST := nil;
gState := STATE_MENU;
g_GUI_ShowWindow('MainMenu');
g_GUI_ShowWindow('NetGameMenu');
gState := STATE_MENU;
g_GUI_ShowWindow('MainMenu');
g_GUI_ShowWindow('NetGameMenu');
Exit;
end;
Exit;
end;
- if e_KeyPressed(IK_SPACE) then
+ if e_KeyPressed(IK_SPACE) or e_KeyPressed(VK_JUMP) then
begin
if not slFetched then
begin
begin
if not slFetched then
begin
slWaitStr := _lc[I_NET_SLIST_NOSERVERS];
end
else
slWaitStr := _lc[I_NET_SLIST_NOSERVERS];
end
else
- slWaitStr := _lc[I_NET_SLIST_ERROR];
+ if SL = nil then
+ slWaitStr := _lc[I_NET_SLIST_ERROR];
slFetched := True;
slSelection := 0;
slFetched := True;
slSelection := 0;
+ g_Serverlist_GenerateTable(SL, ST);
end;
end
else
end;
end
else
if SL = nil then Exit;
if SL = nil then Exit;
- if e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) then
+ if e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) or e_KeyPressed(VK_FIRE) or e_KeyPressed(VK_OPEN) then
begin
if not slReturnPressed then
begin
begin
if not slReturnPressed then
begin
- if SL[slSelection].Password then
+ Srv := GetServerFromTable(slSelection, SL, ST);
+ if Srv.Password then
begin
begin
- PromptIP := SL[slSelection].IP;
- PromptPort := SL[slSelection].Port;
+ PromptIP := Srv.IP;
+ PromptPort := Srv.Port;
gState := STATE_MENU;
g_GUI_ShowWindow('ClientPasswordMenu');
SL := nil;
gState := STATE_MENU;
g_GUI_ShowWindow('ClientPasswordMenu');
SL := nil;
+ ST := nil;
slReturnPressed := True;
Exit;
end
else
slReturnPressed := True;
Exit;
end
else
- g_Game_StartClient(SL[slSelection].IP, SL[slSelection].Port, '');
+ g_Game_StartClient(Srv.IP, Srv.Port, '');
SL := nil;
SL := nil;
+ ST := nil;
slReturnPressed := True;
Exit;
end;
slReturnPressed := True;
Exit;
end;
else
slReturnPressed := False;
else
slReturnPressed := False;
- if e_KeyPressed(IK_DOWN) or e_KeyPressed(IK_KPDOWN) then
+ if e_KeyPressed(IK_DOWN) or e_KeyPressed(IK_KPDOWN) or e_KeyPressed(VK_DOWN) then
begin
if not slDirPressed then
begin
Inc(slSelection);
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;
slDirPressed := True;
end;
end;
- if e_KeyPressed(IK_UP) or e_KeyPressed(IK_KPUP) then
+ if e_KeyPressed(IK_UP) or e_KeyPressed(IK_KPUP) or e_KeyPressed(VK_UP) then
begin
if not slDirPressed then
begin
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;
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)) then
+ if e_KeyPressed(IK_RIGHT) or e_KeyPressed(IK_KPRIGHT) or e_KeyPressed(VK_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) 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)) then
slDirPressed := False;
end;
slDirPressed := False;
end;