index 194a1eda69d89aaaa2212206c09b3f4cc2293086..05d79edd2647194b5ed45698221741b3bdc8feef 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
Port: Word;
Map: string;
Players, MaxPlayers, LocalPl, Bots: Byte;
- Ping: Integer;
+ Ping: Int64;
GameMode: Byte;
Password: Boolean;
PingAddr: ENetAddress;
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, WADEDITOR,
- 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;
slFetched: Boolean = False;
slDirPressed: Boolean = False;
-function GetTimerMS(): Integer;
+function GetTimerMS(): Int64;
begin
- Result := GetTimer() div 1000;
+ Result := GetTimer() {div 1000};
end;
procedure PingServer(var S: TNetServer; Sock: ENetSocket);
var
Buf: ENetBuffer;
- Ping: array [0..5] of Byte;
- ClTime: Integer;
+ Ping: array [0..9] of Byte;
+ ClTime: Int64;
begin
ClTime := GetTimerMS();
Buf.data := Addr(Ping[0]);
- Buf.dataLength := 6;
+ Buf.dataLength := 2+8;
Ping[0] := Ord('D');
Ping[1] := Ord('F');
- LongInt(Addr(Ping[2])^) := ClTime;
+ Int64(Addr(Ping[2])^) := ClTime;
enet_socket_send(Sock, Addr(S.PingAddr), @Buf, 1);
end;
Cnt: Byte;
P: pENetPacket;
MID: Byte;
- I, T, RX: Integer;
+ I, RX: Integer;
+ T: Int64;
Sock: ENetSocket;
Buf: ENetBuffer;
+ InMsg: TMsg;
SvAddr: ENetAddress;
begin
Result := False;
if not g_Net_Slist_Connect then
Exit;
- e_WriteLog('Fetching serverlist...', MSG_NOTIFY);
+ e_WriteLog('Fetching serverlist...', TMsgType.Notify);
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);
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;
- 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
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;
SL[I].PingAddr.port := SL[I].Port + 1;
end;
g_Net_Slist_Disconnect;
- e_Buffer_Clear(@NetOut);
+ NetOut.Clear();
if Length(SL) = 0 then Exit;
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;
while Cnt < Length(SL) do
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;
- NetIn.Len := RX + 1;
- NetIn.ReadPos := 0;
+ InMsg.CurSize := RX;
+
+ InMsg.BeginReading();
- if e_Buffer_Read_Char(@NetIn) <> 'D' then continue;
- if e_Buffer_Read_Char(@NetIn) <> 'F' then continue;
+ if InMsg.ReadChar() <> 'D' then continue;
+ if InMsg.ReadChar() <> 'F' then continue;
for I := Low(SL) to High(SL) do
if (SL[I].PingAddr.host = SvAddr.host) and
begin
with SL[I] do
begin
- Ping := e_Buffer_Read_LongInt(@NetIn);
+ Ping := InMsg.ReadInt64();
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;
Inc(Cnt);
break;
end;
end;
+ InMsg.Free();
enet_socket_destroy(Sock);
end;
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;
- 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;
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();
- 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);
- e_Buffer_Clear(@NetOut);
+ NetOut.Clear();
end;
procedure g_Net_Slist_Remove;
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);
- e_Buffer_Clear(@NetOut);
+ NetOut.Clear();
end;
function g_Net_Slist_Connect: Boolean;
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;
procedure g_Serverlist_Draw(var SL: TNetServerList);
var
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 := '';
end;
procedure g_Serverlist_Control(var SL: TNetServerList);
+var
+ qm: Boolean;
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) then
begin
SL := nil;
gState := STATE_MENU;
if SL = nil then Exit;
- if e_KeyPressed(IK_RETURN) then
+ if e_KeyPressed(IK_RETURN) or e_KeyPressed(IK_KPRETURN) then
begin
if not slReturnPressed then
begin
else
slReturnPressed := False;
- if e_KeyPressed(IK_DOWN) then
+ if e_KeyPressed(IK_DOWN) or e_KeyPressed(IK_KPDOWN) then
begin
if not slDirPressed then
begin
end;
end;
- if e_KeyPressed(IK_UP) then
+ if e_KeyPressed(IK_UP) or e_KeyPressed(IK_KPUP) then
begin
if not slDirPressed then
begin
end;
end;
- if (not e_KeyPressed(IK_DOWN)) and (not e_KeyPressed(IK_UP)) then
+ 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
slDirPressed := False;
end;