index 4137d8b012ef6d22793b06fe1ecf48fd4bf14c8a..f8246d64bf04c85ec4533c5e2204e431da5a8a40 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
interface
-uses ENet;
+uses
+ ENet, SysUtils, e_msg;
const
NET_MCHANS = 2;
pTNetServerList = ^TNetServerList;
TNetServerTable = array of TNetServerRow;
-var
- NetMHost: pENetHost = nil;
- NetMPeer: pENetPeer = nil;
+type
+ TMasterHost = record
+ public
+ hostName: AnsiString;
+ hostPort: Word;
+
+ public
+ //host: pENetHost;
+ peer: pENetPeer;
+ event: ENetEvent;
+ enetAddr: ENetAddress;
+ // inside the game, calling `connect()` is disasterous, as it is blocking.
+ // so we'll use this variable to indicate if "connected" event is received.
+ NetHostConnected: Boolean;
+ NetHostConReqTime: Int64; // to timeout `connect`
+ NetUpdatePending: Boolean; // should we send an update after connection completes?
+ updateSent: Boolean;
+ lastUpdateTime: Int64;
+ addressInited: Boolean;
+
+ private
+ netmsg: TMsg;
+
+ private
+ function processPendingConnection (timeout: Integer=0): Boolean;
+
+ public
+ constructor Create (hostandport: AnsiString);
+
+ procedure clear ();
+
+ function setAddress (hostandport: AnsiString): Boolean;
+
+ function isValid (): Boolean;
+ function isAlive (): Boolean; // not disconnected
+ function isConnecting (): Boolean; // is connection in progress?
+ function isConnected (): Boolean;
+
+ // returns `false` if connection failed
+ function waitForConnection (): Boolean;
+
+ // call as often as you want, the object will do the rest
+ // but try to call this at least once in 100 msecs
+ // returns `true` if we got a packet (it won't be parsed to TMsg)
+ function service (timeout: Integer=0): Boolean;
+ procedure disconnect (spamConsole: Boolean=false);
+ function connect (): Boolean;
+
+ procedure update (immediateSend: Boolean=true);
+ procedure remove ();
+
+ class procedure writeInfo (var msg: TMsg); static;
+
+ // call only if `service()` returned `true`!
+ procedure clearPacket ();
+ end;
+
+
+var
slCurrent: TNetServerList = nil;
slTable: TNetServerTable = nil;
slWaitStr: string = '';
slReturnPressed: Boolean = True;
-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_Remove();
-function g_Net_Slist_Connect(): Boolean;
-procedure g_Net_Slist_Check();
-procedure g_Net_Slist_Disconnect();
-procedure g_Net_Slist_WriteInfo();
+ 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 (immediateSend: Boolean=true);
+procedure g_Net_Slist_Remove ();
+function g_Net_Slist_Connect (blocking: Boolean=True): Boolean;
+procedure g_Net_Slist_Check ();
+procedure g_Net_Slist_Disconnect (spamConsole: Boolean=true);
+procedure g_Net_Slist_WriteInfo ();
+
+function g_Net_Slist_IsConnectionActive (): Boolean; // returns `false` if totally disconnected
+function g_Net_Slist_IsConnectionInProgress (): Boolean;
+}
+
+// make this server private
+procedure g_Net_Slist_Private ();
+
+// called on network mode init
+procedure g_Net_Slist_NetworkStarted ();
+// called on network mode shutdown
+procedure g_Net_Slist_NetworkStopped ();
+
+procedure g_Net_Slist_Pulse ();
+
+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;
-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
- 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;
+ 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,
+ wadreader, g_system, utils;
+
+// make this server private
+procedure g_Net_Slist_Private ();
+begin
+end;
+
+
+// called on network mode init
+procedure g_Net_Slist_NetworkStarted ();
+begin
+end;
+
+// called on network mode shutdown
+procedure g_Net_Slist_NetworkStopped ();
+begin
+end;
+
+
+var
+ NetMHost: pENetHost = nil;
+ mlist: array of TMasterHost = nil;
+
+ slSelection: Byte = 0;
+ slFetched: Boolean = False;
+ slDirPressed: Boolean = False;
+ slReadUrgent: Boolean = False;
+ {
+ NetMHost: pENetHost = nil;
+ NetMPeer: pENetPeer = nil;
+ NetMEvent: ENetEvent;
+ // 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;
+ }
+
+
+//==========================================================================
+//
+// GetTimerMS
+//
+//==========================================================================
+function GetTimerMS (): Int64;
+begin
+ Result := sys_GetTicks() {div 1000};
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.Create
+//
+//==========================================================================
+constructor TMasterHost.Create (hostandport: AnsiString);
+begin
+ //host := nil;
+ peer := nil;
+ ZeroMemory(@event, sizeof(event));
+ NetHostConnected := false;
+ NetHostConReqTime := 0;
+ NetUpdatePending := false;
+ updateSent := false;
+ hostName := '';
+ hostPort := 25665;
+ netmsg.Alloc(NET_BUFSIZE);
+ setAddress(hostandport);
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.clear
+//
+//==========================================================================
+procedure TMasterHost.clear ();
+begin
+ updateSent := false; // do not send 'remove'
+ disconnect();
+ hostName := '';
+ hostPort := 25665;
+ netmsg.Free();
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.setAddress
+//
+//==========================================================================
+function TMasterHost.setAddress (hostandport: AnsiString): Boolean;
+var
+ cp, pp: Integer;
+begin
+ result := false;
+ updateSent := false; // do not send 'remove'
+ disconnect();
+ addressInited := false;
+ hostName := '';
+ hostPort := 25665;
+ hostandport := Trim(hostandport);
+ if (length(hostandport) > 0) then
+ begin
+ hostName := hostandport;
+ cp := Pos(':', hostandport);
+ if (cp > 0) then
+ begin
+ hostName := Copy(hostandport, 1, cp-1);
+ Delete(hostandport, 1, cp);
+ if (length(hostandport) > 0) then
+ begin
+ try
+ pp := StrToInt(hostandport);
+ except
+ pp := -1;
+ end;
+ if (pp > 0) and (pp < 65536) then hostPort := pp else hostPort := 0;
+ end;
+ end;
+ end;
+
+ if not isValid() then exit;
+ if (NetInitDone) then
+ begin
+ if (enet_address_set_host(@enetAddr, PChar(Addr(hostName[1]))) <> 0) then
+ begin
+ hostName := '';
+ hostPort := 0;
+ end;
+ enetAddr.Port := hostPort;
+ end;
+
+ result := isValid();
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.isValid
+//
+//==========================================================================
+function TMasterHost.isValid (): Boolean;
+begin
+ result := (length(hostName) > 0) and (hostPort > 0);
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.isAlive
+//
+// not disconnected
+//
+//==========================================================================
+function TMasterHost.isAlive (): Boolean;
+begin
+ result := (NetMHost <> nil) and (peer <> nil);
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.isConnecting
+//
+// is connection in progress?
+//
+//==========================================================================
+function TMasterHost.isConnecting (): Boolean;
+begin
+ result := isAlive() and (not NetHostConnected);
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.isConnected
+//
+//==========================================================================
+function TMasterHost.isConnected (): Boolean;
+begin
+ result := isAlive() and (NetHostConnected);
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.disconnect
+//
+//==========================================================================
+procedure TMasterHost.disconnect (spamConsole: Boolean=false);
+begin
+ if not isAlive() then exit;
+ if (NetMode = NET_SERVER) and isConnected() and updateSent then remove();
+
+ enet_peer_disconnect(peer, 0);
+ enet_host_flush(NetMHost);
+
+ enet_peer_reset(peer);
+ //enet_host_destroy(NetMHost);
+ peer := nil;
+ //NetMHost := nil;
+ NetHostConnected := False;
+ NetHostConReqTime := 0;
+ NetUpdatePending := false;
+ updateSent := false;
+
+ if (spamConsole) then g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]);
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.connect
+//
+//==========================================================================
+function TMasterHost.connect (): Boolean;
+var
+ res: Integer;
+begin
+ updateSent := false; // do not send 'remove'
+ disconnect();
+ result := false;
+ if not isValid() then exit;
+
+ if (not NetInitDone) then exit;
+
+ if (NetMHost = nil) then
+ begin
+ NetMHost := enet_host_create(nil, 1, NET_MCHANS, 0, 0);
+ if (NetMHost = nil) then
+ begin
+ g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], True);
+ Exit;
+ end;
+ end;
+
+ if (not addressInited) then
+ begin
+ if (enet_address_set_host(@enetAddr, PChar(Addr(hostName[1]))) <> 0) then
+ begin
+ hostName := '';
+ hostPort := 0;
+ exit;
+ end;
+ enetAddr.Port := hostPort;
+ addressInited := true;
+ end;
+
+ peer := enet_host_connect(NetMHost, @enetAddr, NET_MCHANS, 0);
+ if (peer = nil) then
+ begin
+ g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], true);
+ //enet_host_destroy(NetMHost);
+ //NetMHost := nil;
+ exit;
+ end;
+
+ res := enet_host_service(NetMHost, @event, 0);
+ if (res < 0) then
+ begin
+ enet_peer_reset(peer);
+ peer := nil;
+ exit;
+ end;
+
+ result := true;
+ if (res > 0) then
+ begin
+ if (event.kind = ENET_EVENT_TYPE_CONNECT) then
+ begin
+ NetHostConnected := true;
+ g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN]);
+ exit;
+ end;
+ if (event.kind = ENET_EVENT_TYPE_RECEIVE) then enet_packet_destroy(event.packet);
+ end;
+
+ if not NetHostConnected then NetHostConReqTime := GetTimerMS();
+
+ {
+ if (blocking) then
+ begin
+ g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True);
+
+ 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;
+
+
+//==========================================================================
+//
+// TMasterHost.processPendingConnection
+//
+// should be called only if host/peer is here
+// returns `false` if not connected or dead
+//
+//==========================================================================
+function TMasterHost.processPendingConnection (timeout: Integer=0): Boolean;
+var
+ ct: Int64;
+ cres: Integer;
+begin
+ result := false;
+ if not isAlive() then exit;
+ // are we waiting for connection?
+ if (not NetHostConnected) then
+ begin
+ // check for connection event
+ cres := enet_host_service(NetMHost, @event, timeout);
+ if (cres < 0) then
+ begin
+ //TODO: reconnect here
+ updateSent := false; // do not send 'remove'
+ disconnect();
+ exit;
+ end;
+ if (cres > 0) then
+ begin
+ if (event.kind = ENET_EVENT_TYPE_CONNECT) then
+ begin
+ NetHostConnected := true;
+ if NetUpdatePending then update(false);
+ g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN]);
+ result := true;
+ exit;
+ end
+ else if (event.kind = ENET_EVENT_TYPE_DISCONNECT) then
+ begin
+ //TODO: reconnect here
+ updateSent := false; // do not send 'remove'
+ disconnect();
+ exit;
+ end
+ else if (event.kind = ENET_EVENT_TYPE_RECEIVE) then
+ begin
+ enet_packet_destroy(event.packet);
+ end;
+ 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);
+ disconnect(false);
+ end;
+ exit;
+ end;
+ end;
+ result := true;
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.writeInfo
+//
+//==========================================================================
+class procedure TMasterHost.writeInfo (var msg: TMsg);
var
- NetMEvent: ENetEvent;
- slSelection: Byte = 0;
- slFetched: Boolean = False;
- slDirPressed: Boolean = False;
+ wad, map: string;
+begin
+ wad := g_ExtractWadNameNoPath(gMapInfo.Map);
+ map := g_ExtractFileName(gMapInfo.Map);
+
+ msg.Write(NetServerName);
+
+ msg.Write(wad+':/'+map);
+ msg.Write(gGameSettings.GameMode);
+
+ msg.Write(Byte(NetClientCount));
+
+ msg.Write(NetMaxClients);
-function GetTimerMS(): Int64;
+ msg.Write(Byte(NET_PROTOCOL_VER));
+ msg.Write(Byte(NetPassword <> ''));
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.update
+//
+//==========================================================================
+procedure TMasterHost.update (immediateSend: Boolean=true);
+var
+ pkt: pENetPacket;
begin
- Result := GetTimer() {div 1000};
+ if not processPendingConnection() then
+ begin
+ NetUpdatePending := isConnecting();
+ exit;
+ end;
+
+ NetUpdatePending := false;
+
+ netmsg.Clear();
+ netmsg.Write(Byte(NET_MMSG_UPD));
+ netmsg.Write(NetAddr.port);
+
+ writeInfo(netmsg);
+
+ pkt := enet_packet_create(netmsg.Data, netmsg.CurSize, ENET_PACKET_FLAG_RELIABLE);
+ if assigned(pkt) then
+ begin
+ enet_peer_send(peer, NET_MCHAN_UPD, pkt);
+ if (immediateSend) then enet_host_flush(NetMHost);
+ end;
+
+ netmsg.Clear();
end;
-procedure PingServer(var S: TNetServer; Sock: ENetSocket);
+
+//==========================================================================
+//
+// TMasterHost.remove
+//
+//==========================================================================
+procedure TMasterHost.remove ();
+var
+ pkt: pENetPacket;
+begin
+ if not processPendingConnection() then exit;
+
+ netmsg.Clear();
+ netmsg.Write(Byte(NET_MMSG_DEL));
+ netmsg.Write(NetAddr.port);
+
+ pkt := enet_packet_create(netmsg.Data, netmsg.CurSize, ENET_PACKET_FLAG_RELIABLE);
+ if assigned(pkt) then
+ begin
+ enet_peer_send(peer, NET_MCHAN_MAIN, pkt);
+ enet_host_flush(NetMHost);
+ end;
+
+ netmsg.Clear();
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.waitForConnection
+//
+// returns `false` if connection failed
+//
+//==========================================================================
+function TMasterHost.waitForConnection (): Boolean;
+begin
+ result := isAlive();
+ if not result then exit;
+ while isAlive() and isConnecting() do
+ begin
+ if not processPendingConnection(300) then break;
+ end;
+ if not isConnected() then
+ begin
+ updateSent := false; // do not send 'remove'
+ disconnect();
+ end;
+ result := isAlive();
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.service
+//
+// call as often as you want, the object will do the rest
+// but try to call this at least once in 100 msecs
+//
+// returns `true` if we got a packet (it won't be parsed to TMsg)
+//
+//==========================================================================
+function TMasterHost.service (timeout: Integer=0): Boolean;
+var
+ ct: Int64;
+ hres: Integer;
+begin
+ result := false;
+ if not isAlive() then exit;
+ if not processPendingConnection() then exit;
+
+ ct := GetTimerMS();
+ if (ct < lastUpdateTime) or (ct-lastUpdateTime >= 1000*60) then
+ begin
+ lastUpdateTime := ct;
+ update(false);
+ end;
+
+ while true do
+ begin
+ hres := enet_host_service(NetMHost, @event, timeout);
+ if (hres < 0) then
+ begin
+ //TODO: reconnect here
+ updateSent := false; // do not send 'remove'
+ disconnect();
+ exit;
+ end;
+ if (hres = 0) then break;
+ if (event.kind = ENET_EVENT_TYPE_CONNECT) then
+ begin
+ NetHostConnected := true;
+ if NetUpdatePending then update(false);
+ g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN]);
+ end
+ else if (event.kind = ENET_EVENT_TYPE_DISCONNECT) then
+ begin
+ //TODO: reconnect here
+ g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_LOST], True);
+ updateSent := false; // do not send 'remove'
+ disconnect();
+ exit;
+ end
+ else if (event.kind = ENET_EVENT_TYPE_RECEIVE) then
+ begin
+ //enet_packet_destroy(event.packet);
+ //if (timeout <> 0) then break;
+ result := true;
+ exit;
+ end;
+ end;
+end;
+
+
+//==========================================================================
+//
+// TMasterHost.clearPacket
+//
+//==========================================================================
+procedure TMasterHost.clearPacket ();
+begin
+ if (event.packet <> nil) then
+ begin
+ enet_packet_destroy(event.packet);
+ event.packet := nil;
+ end;
+end;
+
+
+//**************************************************************************
+//
+// other functions
+//
+//**************************************************************************
+
+procedure g_Net_Slist_Set (IP: string; Port: Word);
+begin
+ if (length(mlist) = 0) then
+ begin
+ SetLength(mlist, 1);
+ mlist[0].Create(ip+':'+IntToStr(Port));
+ end
+ else
+ begin
+ mlist[0].setAddress(ip+':'+IntToStr(Port));
+ end;
+ e_LogWritefln('Masterserver address set to %s:%u', [IP, Port], TMsgType.Notify);
+ {
+ if NetInitDone then
+ begin
+ enet_address_set_host(@NetSlistAddr, PChar(Addr(IP[1])));
+ NetSlistAddr.Port := Port;
+ e_WriteLog('Masterserver address set to ' + IP + ':' + IntToStr(Port), TMsgType.Notify);
+ end;
+ }
+end;
+
+
+//**************************************************************************
+//
+// main pulse
+//
+//**************************************************************************
+procedure g_Net_Slist_Pulse ();
+begin
+end;
+
+
+//**************************************************************************
+//
+// gui and server list
+//
+//**************************************************************************
+
+//==========================================================================
+//
+// PingServer
+//
+//==========================================================================
+procedure PingServer (var S: TNetServer; Sock: ENetSocket);
var
Buf: ENetBuffer;
Ping: array [0..9] of Byte;
enet_socket_send(Sock, Addr(S.PingAddr), @Buf, 1);
end;
-procedure PingBcast(Sock: ENetSocket);
+
+//==========================================================================
+//
+// PingBcast
+//
+//==========================================================================
+procedure PingBcast (Sock: ENetSocket);
var
S: TNetServer;
begin
PingServer(S, Sock);
end;
-function g_Net_Slist_Fetch(var SL: TNetServerList): Boolean;
+
+//==========================================================================
+//
+// g_Net_Slist_Fetch
+//
+//==========================================================================
+function g_Net_Slist_Fetch (var SL: TNetServerList): Boolean;
var
Cnt: Byte;
P: pENetPacket;
InMsg: TMsg;
SvAddr: ENetAddress;
FromSL: Boolean;
+ MyVer, Str: string;
- procedure ProcessLocal();
+ procedure ProcessLocal ();
begin
I := Length(SL);
SetLength(SL, I + 1);
Bots := InMsg.ReadWord();
end;
end;
- procedure CheckLocalServers();
+
+ procedure CheckLocalServers ();
begin
SetLength(SL, 0);
if Length(SL) = 0 then SL := nil;
end;
+
begin
Result := False;
SL := nil;
- if (NetMHost <> nil) or (NetMPeer <> nil) then
+ if (length(mlist) > 0) and (mlist[0].isAlive()) then
begin
CheckLocalServers();
Exit;
end;
- if not g_Net_Slist_Connect then
+ if (length(mlist) = 0) or (not mlist[0].connect()) then
+ begin
+ CheckLocalServers();
+ Exit;
+ end;
+
+ if not mlist[0].waitForConnection() then
begin
CheckLocalServers();
Exit;
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_peer_send(mlist[0].peer, NET_MCHAN_MAIN, P);
enet_host_flush(NetMHost);
- while enet_host_service(NetMHost, @NetMEvent, 5000) > 0 do
+ while mlist[0].isAlive() do
begin
- if NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE then
+ if not mlist[0].service(5000) then continue;
+ if not InMsg.Init(mlist[0].event.packet^.data, mlist[0].event.packet^.dataLength, True) then
begin
- if not InMsg.Init(NetMEvent.packet^.data, NetMEvent.packet^.dataLength, True) then continue;
+ mlist[0].clearPacket();
+ continue;
+ end;
- MID := InMsg.ReadByte();
+ MID := InMsg.ReadByte();
- if MID <> NET_MMSG_GET then continue;
+ if (MID <> NET_MMSG_GET) then
+ begin
+ mlist[0].clearPacket();
+ continue;
+ end;
- Cnt := InMsg.ReadByte();
- g_Console_Add(_lc[I_NET_MSG] + Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt]), True);
+ Cnt := InMsg.ReadByte();
+ g_Console_Add(_lc[I_NET_MSG]+Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt]), True);
- if Cnt > 0 then
- begin
- SetLength(SL, Cnt);
+ if (Cnt > 0) then
+ begin
+ SetLength(SL, Cnt);
- for I := 0 to Cnt - 1 do
- begin
- SL[I].Number := I;
- 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 := NET_PING_PORT;
- end;
+ for I := 0 to Cnt-1 do
+ begin
+ SL[I].Number := I;
+ 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 := NET_PING_PORT;
end;
+ end;
- Result := True;
- break;
+ 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;
+
+ mlist[0].clearPacket();
+ Result := True;
+ break;
end;
- g_Net_Slist_Disconnect;
+ mlist[0].disconnect(false);
NetOut.Clear();
if Length(SL) = 0 then
if Sock = ENET_SOCKET_NULL then Exit;
enet_socket_set_option(Sock, ENET_SOCKOPT_NONBLOCK, 1);
- 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);
enet_socket_destroy(Sock);
end;
-procedure g_Net_Slist_WriteInfo();
-var
- Wad, Map: string;
- Cli: Byte;
-begin
- Wad := g_ExtractWadNameNoPath(gMapInfo.Map);
- Map := g_ExtractFileName(gMapInfo.Map);
-
- NetOut.Write(NetServerName);
-
- NetOut.Write(Wad + ':\' + Map);
- NetOut.Write(gGameSettings.GameMode);
-
- Cli := NetClientCount;
- NetOut.Write(Cli);
-
- NetOut.Write(NetMaxClients);
-
- NetOut.Write(Byte(NET_PROTOCOL_VER));
- NetOut.Write(Byte(NetPassword <> ''));
-end;
-
-procedure g_Net_Slist_Update;
-var
-
- P: pENetPacket;
-begin
- if (NetMHost = nil) or (NetMPeer = nil) then Exit;
-
- NetOut.Clear();
- NetOut.Write(Byte(NET_MMSG_UPD));
- NetOut.Write(NetAddr.port);
-
- g_Net_Slist_WriteInfo();
-
- 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);
- NetOut.Clear();
-end;
-
-procedure g_Net_Slist_Remove;
-var
- P: pENetPacket;
-begin
- if (NetMHost = nil) or (NetMPeer = nil) then Exit;
- NetOut.Clear();
- NetOut.Write(Byte(NET_MMSG_DEL));
- NetOut.Write(NetAddr.port);
-
- 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);
- NetOut.Clear();
-end;
-
-function g_Net_Slist_Connect: Boolean;
-begin
- Result := False;
-
- NetMHost := enet_host_create(nil, 1, NET_MCHANS, 0, 0);
- if (NetMHost = nil) then
- begin
- g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CLIENT], True);
- Exit;
- end;
-
- NetMPeer := enet_host_connect(NetMHost, @NetSlistAddr, NET_MCHANS, 0);
- if (NetMPeer = nil) then
- begin
- g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_ERR_CLIENT], True);
- enet_host_destroy(NetMHost);
- NetMHost := nil;
- Exit;
- end;
-
- if (enet_host_service(NetMHost, @NetMEvent, 3000) > 0) then
- if NetMEvent.kind = ENET_EVENT_TYPE_CONNECT then
- begin
- Result := True;
- g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_CONN]);
- Exit;
- end
- else
- 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);
-
- NetMHost := nil;
- NetMPeer := nil;
-end;
-
-procedure g_Net_Slist_Disconnect;
-begin
- if (NetMHost = nil) and (NetMPeer = nil) then Exit;
-
- if NetMode = NET_SERVER then g_Net_Slist_Remove;
-
- enet_peer_disconnect(NetMPeer, 0);
- enet_host_flush(NetMHost);
-
- enet_peer_reset(NetMPeer);
- enet_host_destroy(NetMHost);
-
- NetMPeer := nil;
- NetMHost := nil;
-
- 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;
-
- while (enet_host_service(NetMHost, @NetMEvent, 0) > 0) do
- begin
- if NetMEvent.kind = ENET_EVENT_TYPE_DISCONNECT then
- begin
- g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_LOST], True);
- if NetMPeer <> nil then enet_peer_reset(NetMPeer);
- if NetMHost <> nil then enet_host_destroy(NetMHost);
- NetMPeer := nil;
- NetMHost := nil;
- Break;
- end
- else
- if NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE then
- enet_packet_destroy(NetMEvent.packet);
- end;
-end;
-
-procedure g_Net_Slist_Set(IP: string; Port: Word);
-begin
- if NetInitDone then
- begin
- enet_address_set_host(@NetSlistAddr, PChar(Addr(IP[1])));
- NetSlistAddr.Port := Port;
- e_WriteLog('Masterserver address set to ' + IP + ':' + IntToStr(Port), TMsgType.Notify);
- end;
-end;
-
-function GetServerFromTable(Index: Integer; SL: TNetServerList; ST: TNetServerTable): TNetServer;
+//==========================================================================
+//
+// GetServerFromTable
+//
+//==========================================================================
+function GetServerFromTable (Index: Integer; SL: TNetServerList; ST: TNetServerTable): TNetServer;
begin
Result.Number := 0;
Result.Protocol := 0;
Result := SL[ST[Index].Indices[ST[Index].Current]];
end;
-procedure g_Serverlist_Draw(var SL: TNetServerList; var ST: TNetServerTable);
+
+//==========================================================================
+//
+// g_Serverlist_Draw
+//
+//==========================================================================
+procedure g_Serverlist_Draw (var SL: TNetServerList; var ST: TNetServerTable);
var
Srv: TNetServer;
- sy, i, y, mw, mx, l: Integer;
+ 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,
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);
y := y + 42;
end;
- e_TextureFontPrintEx(20, gScreenHeight-61, ip, gStdFont, 205, 205, 205, 1);
+ 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,
- gScreenHeight-61, ip, gStdFont, 205, 205, 205, 1);
+ motdh-20+3, ip, gStdFont, 205, 205, 205, 1);
end;
-procedure g_Serverlist_GenerateTable(SL: TNetServerList; var ST: TNetServerTable);
+
+//==========================================================================
+//
+// g_Serverlist_GenerateTable
+//
+//==========================================================================
+procedure g_Serverlist_GenerateTable (SL: TNetServerList; var ST: TNetServerTable);
var
i, j: Integer;
SortRows();
end;
-procedure g_Serverlist_Control(var SL: TNetServerList; var ST: TNetServerTable);
+
+//==========================================================================
+//
+// g_Serverlist_Control
+//
+//==========================================================================
+procedure g_Serverlist_Control (var SL: TNetServerList; var ST: TNetServerTable);
var
qm: Boolean;
Srv: TNetServer;
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;
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
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
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
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
end;
end;
- if e_KeyPressed(IK_RIGHT) or e_KeyPressed(IK_KPRIGHT) or e_KeyPressed(VK_RIGHT) 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
end;
end;
- if e_KeyPressed(IK_LEFT) or e_KeyPressed(IK_KPLEFT) or e_KeyPressed(VK_LEFT) then
+ 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
(not e_KeyPressed(VK_DOWN)) and
(not e_KeyPressed(VK_UP)) and
(not e_KeyPressed(VK_RIGHT)) and
- (not e_KeyPressed(VK_LEFT)) then
+ (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;
+
end.