X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=0b9e546f8100966a36906c5af11c36c986a6e41b;hb=66647a58f13c9697541ec72248cbf95b10f8524f;hp=0f27d5f78255dbf9b1cc163d4705ecb9e36d9716;hpb=ac1d7f91183dbf6357baa265ae56b2603f4385c2;p=d2df-sdl.git

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index 0f27d5f..0b9e546 100644
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
@@ -2,8 +2,7 @@
  *
  * 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
@@ -18,7 +17,8 @@ unit g_netmaster;
 
 interface
 
-uses ENet;
+uses
+  ENet, SysUtils, e_msg;
 
 const
   NET_MCHANS = 2;
@@ -34,10 +34,10 @@ type
   TNetServer = record
     Number: Byte;
     Protocol: Byte;
-    Name: string;
-    IP: string;
+    Name: AnsiString;
+    IP: AnsiString;
     Port: Word;
-    Map: string;
+    Map: AnsiString;
     Players, MaxPlayers, LocalPl, Bots: Byte;
     Ping: Int64;
     GameMode: Byte;
@@ -54,46 +54,783 @@ type
   pTNetServerList = ^TNetServerList;
   TNetServerTable = array of TNetServerRow;
 
-var
-  NetMHost:       pENetHost = nil;
-  NetMPeer:       pENetPeer = nil;
+type
+  TMasterHost = record
+  public
+    hostName: AnsiString;
+    hostPort: Word;
+
+  public
+    peer: pENetPeer;
+    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`; -1 means "waiting for shutdown"
+    NetUpdatePending: Boolean; // should we send an update after connection completes?
+    updateSent: Boolean;
+    lastUpdateTime: Int64;
+    // server list request working flags
+    srvAnswered: Integer;
+    srvAnswer: array of TNetServer;
+    slMOTD: AnsiString;
+    slUrgent: AnsiString;
+    slReadUrgent: Boolean;
+
+  private
+    netmsg: TMsg;
+
+  public
+    constructor Create (hostandport: AnsiString);
+
+    procedure clear ();
+
+    function setAddress (hostandport: AnsiString): Boolean;
+
+    function isSameAddress (hostandport: AnsiString): Boolean;
+
+    function isValid (): Boolean;
+    function isAlive (): Boolean; // not disconnected
+    function isConnecting (): Boolean; // is connection in progress?
+    function isConnected (): Boolean;
+
+    // call as often as you want, the object will do the rest
+    // but try to call this at least once in 100 msecs
+    procedure pulse ();
+
+    procedure disconnect (forced: Boolean);
+    function connect (): Boolean;
+
+    procedure update ();
+    procedure remove ();
+
+    class procedure writeInfo (var msg: TMsg); static;
+
+    procedure connectedEvent ();
+    procedure disconnectedEvent ();
+    procedure receivedEvent (pkt: pENetPacket); // `pkt` is never `nil`
+  end;
 
+
+var
   slCurrent:       TNetServerList = nil;
   slTable:         TNetServerTable = nil;
-  slWaitStr:       string = '';
+  slWaitStr:       AnsiString = '';
   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: AnsiString = '';
+  slUrgent: AnsiString = '';
+
+
+procedure g_Net_Slist_Set (IP: AnsiString; Port: Word);
+function g_Net_Slist_Fetch (var SL: TNetServerList): Boolean;
+
+// make this server private
+procedure g_Net_Slist_Private ();
+// make this server public
+procedure g_Net_Slist_Public ();
+
+// called while the server is running
+procedure g_Net_Slist_ServerUpdate ();
+// called when the server is started
+procedure g_Net_Slist_ServerStarted ();
+// called when the server is stopped
+procedure g_Net_Slist_ServerClosed ();
+
+// called when new netword player comes
+procedure g_Net_Slist_ServerPlayerComes ();
+// called when new netword player comes
+procedure g_Net_Slist_ServerPlayerLeaves ();
+// started new map
+procedure g_Net_Slist_ServerMapStarted ();
+// this server renamed (or password mode changed, or other params changed)
+procedure g_Net_Slist_ServerRenamed ();
+
+procedure g_Net_Slist_Pulse (timeout: Integer=0);
+
+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;
 
+// if g_Game_IsServer and g_Game_IsNet and NetUseMaster then
+
+// make this server private
+procedure g_Net_Slist_Private ();
+begin
+end;
+
+// make this server public
+procedure g_Net_Slist_Public ();
+begin
+end;
+
+// called while the server is running
+procedure g_Net_Slist_ServerUpdate ();
+begin
+end;
+
+// called when the server is started
+procedure g_Net_Slist_ServerStarted ();
+begin
+end;
+
+// called when the server is stopped
+procedure g_Net_Slist_ServerClosed ();
+begin
+end;
+
+// called when new netword player comes
+procedure g_Net_Slist_ServerPlayerComes ();
+begin
+end;
+
+// called when new netword player comes
+procedure g_Net_Slist_ServerPlayerLeaves ();
+begin
+end;
+
+// started new map
+procedure g_Net_Slist_ServerMapStarted ();
+begin
+end;
+
+// this server renamed (or password mode changed, or other params changed)
+procedure g_Net_Slist_ServerRenamed ();
+begin
+end;
+
+
+// ////////////////////////////////////////////////////////////////////////// //
 var
-  NetMEvent:      ENetEvent;
-  slSelection:    Byte = 0;
-  slFetched:      Boolean = False;
-  slDirPressed:   Boolean = False;
+  NetMHost: pENetHost = nil;
+  NetMEvent: ENetEvent;
+  mlist: array of TMasterHost = nil;
+
+  slSelection: Byte = 0;
+  slFetched: Boolean = False;
+  slDirPressed: Boolean = False;
+  slReadUrgent: Boolean = False;
+
+
+//==========================================================================
+//
+//  GetTimerMS
+//
+//==========================================================================
+function GetTimerMS (): Int64;
+begin
+  Result := sys_GetTicks() {div 1000};
+end;
+
+
+//==========================================================================
+//
+//  findByPeer
+//
+//==========================================================================
+function findByPeer (peer: pENetPeer): Integer;
+var
+  f: Integer;
+begin
+  for f := 0 to High(mlist) do if (mlist[f].peer = peer) then begin result := f; exit; end;
+  result := -1;
+end;
+
+
+//==========================================================================
+//
+//  TMasterHost.Create
+//
+//==========================================================================
+constructor TMasterHost.Create (hostandport: AnsiString);
+begin
+  peer := nil;
+  NetHostConnected := false;
+  NetHostConReqTime := 0;
+  NetUpdatePending := false;
+  updateSent := false;
+  hostName := '';
+  hostPort := 25665;
+  SetLength(srvAnswer, 0);
+  srvAnswered := 0;
+  slMOTD := '';
+  slUrgent := '';
+  slReadUrgent := true;
+  netmsg.Alloc(NET_BUFSIZE);
+  setAddress(hostandport);
+end;
+
 
-function GetTimerMS(): Int64;
+//==========================================================================
+//
+//  TMasterHost.clear
+//
+//==========================================================================
+procedure TMasterHost.clear ();
 begin
-  Result := GetTimer() {div 1000};
+  updateSent := false; // do not send 'remove'
+  disconnect(true);
+  hostName := '';
+  hostPort := 25665;
+  netmsg.Free();
+  SetLength(srvAnswer, 0);
+  srvAnswered := 0;
+  slMOTD := '';
+  slUrgent := '';
+  slReadUrgent := true;
 end;
 
-procedure PingServer(var S: TNetServer; Sock: ENetSocket);
+
+//==========================================================================
+//
+//  TMasterHost.isSameAddress
+//
+//==========================================================================
+function TMasterHost.isSameAddress (hostandport: AnsiString): Boolean;
+var
+  cp, pp: Integer;
+  hn: AnsiString;
+begin
+  result := false;
+  if not isValid() then exit;
+  hostandport := Trim(hostandport);
+  if (length(hostandport) = 0) then exit;
+  hn := hostandport;
+  cp := Pos(':', hostandport);
+  if (cp > 0) then
+  begin
+    hn := Copy(hostandport, 1, cp-1);
+    Delete(hostandport, 1, cp);
+    if (length(hostandport) > 0) then
+    begin
+      try
+        pp := StrToInt(hostandport);
+      except
+        pp := -1;
+      end;
+    end;
+  end
+  else
+  begin
+    pp := 25665;
+  end;
+  result := strEquCI1251(hn, hostName) and (hostPort = pp);
+end;
+
+
+//==========================================================================
+//
+//  TMasterHost.setAddress
+//
+//==========================================================================
+function TMasterHost.setAddress (hostandport: AnsiString): Boolean;
+var
+  cp, pp: Integer;
+begin
+  result := false;
+  SetLength(srvAnswer, 0);
+  srvAnswered := 0;
+  slMOTD := '';
+  slUrgent := '';
+  slReadUrgent := true;
+  updateSent := false; // do not send 'remove'
+  disconnect(true);
+  hostName := '';
+  hostPort := 25665;
+
+  if (not g_Net_IsNetworkAvailable()) then exit;
+
+  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 (enet_address_set_host(@enetAddr, PChar(Addr(hostName[1]))) <> 0) then
+  begin
+    writeln('SHIT!');
+    hostName := '';
+    hostPort := 0;
+  end;
+  enetAddr.Port := hostPort;
+
+  result := isValid();
+  //writeln('*********************: ', hostandport, ' [', hostName, ':', hostPort, '] ', result);
+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) and (NetHostConReqTime <> -1);
+end;
+
+
+//==========================================================================
+//
+//  TMasterHost.isConnected
+//
+//==========================================================================
+function TMasterHost.isConnected (): Boolean;
+begin
+  result := isAlive() and (NetHostConnected) and (NetHostConReqTime <> -1);
+end;
+
+
+//==========================================================================
+//
+//  TMasterHost.connectedEvent
+//
+//==========================================================================
+procedure TMasterHost.connectedEvent ();
+begin
+  if not isAlive() then exit;
+  if NetHostConnected then exit;
+  NetHostConnected := true;
+  e_LogWritefln('connected to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+end;
+
+
+//==========================================================================
+//
+//  TMasterHost.disconnectedEvent
+//
+//==========================================================================
+procedure TMasterHost.disconnectedEvent ();
+begin
+  if not isAlive() then exit;
+  e_LogWritefln('disconnected from master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+  disconnect(true);
+  //if (spamConsole) then g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]);
+end;
+
+
+//==========================================================================
+//
+//  TMasterHost.receivedEvent
+//
+//  `pkt` is never `nil`
+//
+//==========================================================================
+procedure TMasterHost.receivedEvent (pkt: pENetPacket);
+var
+  msg: TMsg;
+  MID: Byte;
+  Cnt: Byte;
+  f: Integer;
+  s: AnsiString;
+begin
+  e_LogWritefln('received packed from master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+  if not msg.Init(pkt^.data, pkt^.dataLength, True) then exit;
+  // packet type
+  MID := msg.ReadByte();
+  if (MID <> NET_MMSG_GET) then exit;
+  e_LogWritefln('received list packet from master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+  SetLength(srvAnswer, 0);
+  if (srvAnswered > 0) then Inc(srvAnswered);
+  slMOTD := '';
+  //slUrgent := '';
+  slReadUrgent := true;
+  // number of items
+  Cnt := msg.ReadByte();
+  g_Console_Add(_lc[I_NET_MSG]+Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt]), True);
+  if (Cnt > 0) then
+  begin
+    SetLength(srvAnswer, Cnt);
+    for f := 0 to Cnt-1 do
+    begin
+      srvAnswer[f].Number := f;
+      srvAnswer[f].IP := msg.ReadString();
+      srvAnswer[f].Port := msg.ReadWord();
+      srvAnswer[f].Name := msg.ReadString();
+      srvAnswer[f].Map := msg.ReadString();
+      srvAnswer[f].GameMode := msg.ReadByte();
+      srvAnswer[f].Players := msg.ReadByte();
+      srvAnswer[f].MaxPlayers := msg.ReadByte();
+      srvAnswer[f].Protocol := msg.ReadByte();
+      srvAnswer[f].Password := msg.ReadByte() = 1;
+      enet_address_set_host(Addr(srvAnswer[f].PingAddr), PChar(Addr(srvAnswer[f].IP[1])));
+      srvAnswer[f].Ping := -1;
+      srvAnswer[f].PingAddr.port := NET_PING_PORT;
+    end;
+  end;
+
+  if (msg.ReadCount < msg.CurSize) then
+  begin
+    // new master, supports version reports
+    s := msg.ReadString();
+    if (s <> {MyVer}GAME_VERSION) then
+    begin
+      { TODO }
+      g_Console_Add('!!! UpdVer = `'+s+'`');
+    end;
+    // even newer master, supports extra info
+    if (msg.ReadCount < msg.CurSize) then
+    begin
+      slMOTD := b_Text_Format(msg.ReadString());
+      s := b_Text_Format(msg.ReadString());
+      // check if the message has updated and the user has to read it again
+      if (slUrgent <> s) then slReadUrgent := false;
+      slUrgent := s;
+    end;
+  end;
+end;
+
+
+//==========================================================================
+//
+//  TMasterHost.pulse
+//
+//  this performs various scheduled tasks, if necessary
+//
+//==========================================================================
+procedure TMasterHost.pulse ();
+var
+  ct: Int64;
+begin
+  if not isAlive() then exit;
+  if (NetHostConReqTime = -1) then exit; // waiting for shutdown (disconnect in progress)
+  // process pending connection timeout
+  if (not NetHostConnected) then
+  begin
+    ct := GetTimerMS();
+    if (ct < NetHostConReqTime) or (ct-NetHostConReqTime >= 3000) then
+    begin
+      e_LogWritefln('failed to connect to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+      // do not spam with error messages, it looks like the master is down
+      //g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True);
+      enet_peer_disconnect(peer, 0);
+      // main pulse will take care of the rest
+    end;
+    exit;
+  end;
+end;
+
+
+//==========================================================================
+//
+//  TMasterHost.disconnect
+//
+//==========================================================================
+procedure TMasterHost.disconnect (forced: Boolean);
+begin
+  if not isAlive() then exit;
+  //if (NetMode = NET_SERVER) and isConnected() and updateSent then remove();
+
+  if (forced) then
+  begin
+    enet_peer_reset(peer);
+    peer := nil;
+    NetHostConReqTime := 0;
+  end
+  else
+  begin
+    enet_peer_disconnect_later(peer, 0);
+    // main pulse will take care of the rest
+    NetHostConReqTime := -1;
+  end;
+
+  NetHostConnected := false;
+  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;
+begin
+  result := false;
+  if not isValid() then exit;
+  if (NetHostConReqTime = -1) then
+  begin
+    disconnect(true);
+  end
+  else
+  begin
+    if isAlive() then begin result := true; exit; end;
+  end;
+
+  SetLength(srvAnswer, 0);
+  srvAnswered := 0;
+  NetHostConnected := false;
+  NetHostConReqTime := 0;
+  NetUpdatePending := false;
+  updateSent := false;
+
+  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);
+    exit;
+  end;
+
+  NetHostConReqTime := GetTimerMS();
+  e_LogWritefln('connecting to master at [%s:%u]', [hostName, hostPort], TMsgType.Notify);
+end;
+
+
+//==========================================================================
+//
+//  TMasterHost.writeInfo
+//
+//==========================================================================
+class procedure TMasterHost.writeInfo (var msg: TMsg);
+var
+  wad, map: AnsiString;
+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);
+
+  msg.Write(Byte(NET_PROTOCOL_VER));
+  msg.Write(Byte(NetPassword <> ''));
+end;
+
+
+//==========================================================================
+//
+//  TMasterHost.update
+//
+//==========================================================================
+procedure TMasterHost.update ();
+var
+  pkt: pENetPacket;
+begin
+  if not isAlive() then exit;
+  if not isConnected() then
+  begin
+    NetUpdatePending := isConnecting();
+    exit;
+  end;
+
+  netmsg.Clear();
+  try
+    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
+      if (enet_peer_send(peer, NET_MCHAN_UPD, pkt) = 0) then NetUpdatePending := false;
+    end;
+  finally
+    netmsg.Clear();
+  end;
+end;
+
+
+//==========================================================================
+//
+//  TMasterHost.remove
+//
+//==========================================================================
+procedure TMasterHost.remove ();
+var
+  pkt: pENetPacket;
+begin
+  NetUpdatePending := false;
+  if not isAlive() then exit;
+  if not isConnected() then exit;
+
+  netmsg.Clear();
+  try
+    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);
+    end;
+  finally
+    netmsg.Clear();
+  end;
+end;
+
+
+//**************************************************************************
+//
+// other functions
+//
+//**************************************************************************
+
+procedure g_Net_Slist_Set (IP: AnsiString; Port: Word);
+var
+  f: Integer;
+  sa: AnsiString;
+begin
+  if (not g_Net_IsNetworkAvailable()) then exit;
+  IP := Trim(IP);
+  if (length(IP) = 0) or (Port = 0) then exit;
+  sa := IP+':'+IntToStr(Port);
+  for f := 0 to High(mlist) do if (mlist[f].isSameAddress(sa)) then exit;
+  SetLength(mlist, length(mlist)+1);
+  mlist[High(mlist)].Create(sa);
+  mlist[High(mlist)].setAddress(sa);
+  e_LogWritefln('Masterserver address set to [%s:%u]', [IP, Port], TMsgType.Notify);
+end;
+
+
+//**************************************************************************
+//
+// main pulse
+//
+//**************************************************************************
+procedure g_Net_Slist_Pulse (timeout: Integer=0);
+var
+  f: Integer;
+  sres: Integer;
+  idx: Integer;
+begin
+  if (not g_Net_IsNetworkAvailable()) then exit;
+
+  if (length(mlist) = 0) then
+  begin
+    if (NetMHost <> nil) then
+    begin
+      enet_host_destroy(NetMHost);
+      NetMHost := nil;
+      exit;
+    end;
+  end;
+
+  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);
+      for f := 0 to High(mlist) do mlist[f].clear();
+      SetLength(mlist, 0);
+      Exit;
+    end;
+  end;
+
+  for f := 0 to High(mlist) do mlist[f].pulse();
+
+  while true do
+  begin
+    sres := enet_host_service(NetMHost, @NetMEvent, timeout);
+    if (sres < 0) then
+    begin
+      g_Console_Add(_lc[I_NET_MSG_ERROR]+_lc[I_NET_ERR_CLIENT], True);
+      for f := 0 to High(mlist) do mlist[f].clear();
+      SetLength(mlist, 0);
+      enet_host_destroy(NetMHost);
+      NetMHost := nil;
+      exit;
+    end;
+
+    if (sres = 0) then break;
+    idx := findByPeer(NetMEvent.peer);
+    if (idx < 0) then
+    begin
+      e_LogWriteln('network event from unknown master host. ignored.', TMsgType.Warning);
+      if (NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE) then enet_packet_destroy(NetMEvent.packet);
+      continue;
+    end;
+
+    if (NetMEvent.kind = ENET_EVENT_TYPE_CONNECT) then
+    begin
+      mlist[idx].connectedEvent();
+    end
+    else if (NetMEvent.kind = ENET_EVENT_TYPE_DISCONNECT) then
+    begin
+      mlist[idx].disconnectedEvent();
+    end
+    else if (NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE) then
+    begin
+      mlist[idx].receivedEvent(NetMEvent.packet);
+      enet_packet_destroy(NetMEvent.packet);
+    end;
+  end;
+end;
+
+
+//**************************************************************************
+//
+// gui and server list
+//
+//**************************************************************************
+
+//==========================================================================
+//
+//  PingServer
+//
+//==========================================================================
+procedure PingServer (var S: TNetServer; Sock: ENetSocket);
 var
   Buf: ENetBuffer;
   Ping: array [0..9] of Byte;
@@ -111,7 +848,13 @@ begin
   enet_socket_send(Sock, Addr(S.PingAddr), @Buf, 1);
 end;
 
-procedure PingBcast(Sock: ENetSocket);
+
+//==========================================================================
+//
+//  PingBcast
+//
+//==========================================================================
+procedure PingBcast (Sock: ENetSocket);
 var
   S: TNetServer;
 begin
@@ -123,11 +866,16 @@ 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;
-  MID: Byte;
+  pkt: pENetPacket;
   I, RX: Integer;
   T: Int64;
   Sock: ENetSocket;
@@ -135,8 +883,37 @@ var
   InMsg: TMsg;
   SvAddr: ENetAddress;
   FromSL: Boolean;
+  MyVer: AnsiString;
+
+  procedure DisconnectAll ();
+  var
+    f: Integer;
+    hasAlive: Boolean;
+    //stt, ct: Int64;
+  begin
+    //stt := GetTimerMS();
+    while (length(mlist) > 0) do
+    begin
+      hasAlive := false;
+      for f := 0 to High(mlist) do
+      begin
+        if (mlist[f].isAlive()) then
+        begin
+          hasAlive := true;
+          mlist[f].disconnect(false);
+        end;
+      end;
+      if not hasAlive then break;
+      break;
+      {
+      g_Net_Slist_Pulse(100);
+      ct := GetTimerMS();
+      if (ct < stt) or (ct-stt > 800) then break;
+      }
+    end;
+  end;
 
-  procedure ProcessLocal();
+  procedure ProcessLocal ();
   begin
     I := Length(SL);
     SetLength(SL, I + 1);
@@ -157,7 +934,8 @@ var
       Bots := InMsg.ReadWord();
     end;
   end;
-  procedure CheckLocalServers();
+
+  procedure CheckLocalServers ();
   begin
     SetLength(SL, 0);
 
@@ -193,289 +971,237 @@ var
 
     if Length(SL) = 0 then SL := nil;
   end;
+
+var
+  f, c, n, pos: Integer;
+  aliveCount: Integer;
+  hasUnanswered: Boolean;
+  stt, ct: Int64;
 begin
-  Result := False;
+  result := false;
   SL := nil;
 
-  if (NetMHost <> nil) or (NetMPeer <> nil) then
-  begin
-    CheckLocalServers();
-    Exit;
-  end;
-
-  if not g_Net_Slist_Connect then
+  if (not g_Net_IsNetworkAvailable()) then
   begin
-    CheckLocalServers();
-    Exit;
+    SetLength(SL, 0);
+    exit;
   end;
 
-  e_WriteLog('Fetching serverlist...', TMsgType.Notify);
-  g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_FETCH]);
+  g_Net_Slist_Pulse(); // this will create mhost
 
   NetOut.Clear();
   NetOut.Write(Byte(NET_MMSG_GET));
 
-  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);
-
-  while enet_host_service(NetMHost, @NetMEvent, 5000) > 0 do
-  begin
-    if NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE then
-    begin
-      if not InMsg.Init(NetMEvent.packet^.data, NetMEvent.packet^.dataLength, True) then continue;
-
-      MID := InMsg.ReadByte();
-
-      if MID <> NET_MMSG_GET then continue;
+  // TODO: what should we identify the build with?
+  MyVer := GAME_VERSION;
+  NetOut.Write(MyVer);
 
-      Cnt := InMsg.ReadByte();
-      g_Console_Add(_lc[I_NET_MSG] + Format(_lc[I_NET_SLIST_RETRIEVED], [Cnt]), True);
+  try
+    e_WriteLog('Fetching serverlist...', TMsgType.Notify);
+    g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_FETCH]);
 
-      if Cnt > 0 then
+    // wait until all servers connected and answered
+    stt := GetTimerMS();
+    while true do
+    begin
+      g_Net_Slist_Pulse(300);
+      aliveCount := 0;
+      hasUnanswered := false;
+      for f := 0 to High(mlist) do
       begin
-        SetLength(SL, Cnt);
-
-        for I := 0 to Cnt - 1 do
+        {
+        e_LogWritefln('  master #%d: [%s:%u] valid=%d; alive=%d; connected=%d; connecting=%d',
+          [f, mlist[f].hostName, mlist[f].hostPort, Integer(mlist[f].isValid()), Integer(mlist[f].isAlive()),
+          Integer(mlist[f].isConnected()), Integer(mlist[f].isConnecting())], TMsgType.Notify);
+        }
+        if (not mlist[f].isValid()) then continue;
+        if (not mlist[f].isAlive()) then
+        begin
+          mlist[f].connect();
+          if (mlist[f].isAlive()) then
+          begin
+            hasUnanswered := true;
+            stt := GetTimerMS();
+          end;
+        end
+        else if (mlist[f].isConnected()) then
         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;
+          if (mlist[f].srvAnswered = 0) then
+          begin
+            pkt := enet_packet_create(NetOut.Data, NetOut.CurSize, Cardinal(ENET_PACKET_FLAG_RELIABLE));
+            if assigned(pkt) then
+            begin
+              if (enet_peer_send(mlist[f].peer, NET_MCHAN_MAIN, pkt) = 0) then
+              begin
+                hasUnanswered := true;
+                mlist[f].srvAnswered := 1;
+                stt := GetTimerMS();
+              end;
+            end;
+          end
+          else if (mlist[f].srvAnswered = 1) then
+          begin
+            hasUnanswered := true;
+          end
+          else if (mlist[f].srvAnswered > 1) then
+          begin
+            Inc(aliveCount);
+          end;
+        end
+        else if (mlist[f].isConnecting()) then
+        begin
+          hasUnanswered := true;
         end;
       end;
-
-      Result := True;
-      break;
+      if (not hasUnanswered) then break;
+      // check for timeout
+      ct := GetTimerMS();
+      if (ct < stt) or (ct-stt > 4000) then break;
     end;
-  end;
-
-  g_Net_Slist_Disconnect;
-  NetOut.Clear();
-
-  if Length(SL) = 0 then
-  begin
-    CheckLocalServers();
-    Exit;
-  end;
-
-  Sock := enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM);
-  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);
-
-  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;
-  Cnt := 0;
-  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 (aliveCount = 0) then
+    begin
+      DisconnectAll();
+      CheckLocalServers();
+      exit;
+    end;
 
-    if InMsg.ReadChar() <> 'D' then continue;
-    if InMsg.ReadChar() <> 'F' then continue;
+    slMOTD := '';
+    {
+    slUrgent := '';
+    slReadUrgent := true;
+    }
 
-    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
+    SetLength(SL, 0);
+    for f := 0 to High(mlist) do
+    begin
+      if (mlist[f].srvAnswered < 2) then continue;
+      for n := 0 to High(mlist[f].srvAnswer) do
       begin
-        with SL[I] do
+        pos := -1;
+        for c := 0 to High(SL) do
         begin
-          Port := InMsg.ReadWord();
-          Ping := InMsg.ReadInt64();
-          Ping := GetTimerMS() - Ping;
-          Name := InMsg.ReadString();
-          Map := InMsg.ReadString();
-          GameMode := InMsg.ReadByte();
-          Players := InMsg.ReadByte();
-          MaxPlayers := InMsg.ReadByte();
-          Protocol := InMsg.ReadByte();
-          Password := InMsg.ReadByte() = 1;
-          LocalPl := InMsg.ReadByte();
-          Bots := InMsg.ReadWord();
+          if (SL[c].IP = mlist[f].srvAnswer[n].IP) and (SL[c].Port = mlist[f].srvAnswer[n].Port) then
+          begin
+            pos := c;
+            break;
+          end;
+        end;
+        if (pos < 0) then
+        begin
+          pos := length(SL);
+          SetLength(SL, pos+1);
+          SL[pos] := mlist[f].srvAnswer[n];
+          SL[pos].Number := pos;
         end;
-        FromSL := True;
-        Inc(Cnt);
-        break;
       end;
-    if not FromSL then
-      ProcessLocal();
-  end;
-
-  InMsg.Free();
-  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;
+      if (not mlist[f].slReadUrgent) and (mlist[f].slUrgent <> '') then
+      begin
+        if (mlist[f].slUrgent <> slUrgent) then
+        begin
+          slUrgent := mlist[f].slUrgent;
+          slReadUrgent := false;
+        end;
+      end;
+      if (slMOTD <> '') and (mlist[f].slMOTD <> '') then
+      begin
+        slMOTD := mlist[f].slMOTD;
+      end;
+    end;
 
-  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;
+    DisconnectAll();
 
-  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
+    if (length(SL) = 0) 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);
+      CheckLocalServers();
+      exit;
+    end;
 
-  g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True);
+    Sock := enet_socket_create(ENET_SOCKET_TYPE_DATAGRAM);
+    if Sock = ENET_SOCKET_NULL then Exit;
+    enet_socket_set_option(Sock, ENET_SOCKOPT_NONBLOCK, 1);
 
-  NetMHost := nil;
-  NetMPeer := nil;
-end;
+    for I := Low(SL) to High(SL) do PingServer(SL[I], Sock);
 
-procedure g_Net_Slist_Disconnect;
-begin
-  if (NetMHost = nil) and (NetMPeer = nil) then Exit;
+    enet_socket_set_option(Sock, ENET_SOCKOPT_BROADCAST, 1);
+    PingBcast(Sock);
 
-  if NetMode = NET_SERVER then g_Net_Slist_Remove;
+    T := GetTimerMS();
 
-  enet_peer_disconnect(NetMPeer, 0);
-  enet_host_flush(NetMHost);
+    InMsg.Alloc(NET_BUFSIZE);
+    Buf.data := InMsg.Data;
+    Buf.dataLength := InMsg.MaxSize;
+    Cnt := 0;
+    while GetTimerMS() - T <= 500 do
+    begin
+      InMsg.Clear();
 
-  enet_peer_reset(NetMPeer);
-  enet_host_destroy(NetMHost);
+      RX := enet_socket_receive(Sock, @SvAddr, @Buf, 1);
+      if RX <= 0 then continue;
+      InMsg.CurSize := RX;
 
-  NetMPeer := nil;
-  NetMHost := nil;
+      InMsg.BeginReading();
 
-  g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]);
-end;
+      if InMsg.ReadChar() <> 'D' then continue;
+      if InMsg.ReadChar() <> 'F' then continue;
 
-procedure g_Net_Slist_Check;
-begin
-  if (NetMHost = nil) or (NetMPeer = nil) then Exit;
+      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
+            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;
+          FromSL := True;
+          Inc(Cnt);
+          break;
+        end;
+      if not FromSL then
+        ProcessLocal();
+    end;
 
-  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);
+    InMsg.Free();
+    enet_socket_destroy(Sock);
+  finally
+    NetOut.Clear();
   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.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
@@ -483,15 +1209,21 @@ begin
   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;
   hh: Word = 0;
-  ip: string;
+  ip: AnsiString;
 begin
   ip := '';
   sy := 0;
@@ -504,15 +1236,49 @@ begin
   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,
@@ -543,30 +1309,28 @@ begin
   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(ST) do
   begin
     Srv := GetServerFromTable(I, SL, ST);
+    // Name and map
     e_TextureFontPrintEx(18, y, Srv.Name, gStdFont, 255, 255, 255, 1);
     e_TextureFontPrintEx(18, y + 16, Srv.Map, gStdFont, 210, 210, 210, 1);
 
-    y := y + 42;
-  end;
-
-  e_TextureFontPrintEx(mx - 68, 68, 'PING', gStdFont, 255, 127, 0, 1);
-  y := 90;
-  for I := 0 to High(ST) do
-  begin
-    Srv := GetServerFromTable(I, SL, ST);
+    // 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
@@ -578,50 +1342,36 @@ begin
     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;
-
-  e_TextureFontPrintEx(mx + 2, 68, 'MODE', gStdFont, 255, 127, 0, 1);
-  y := 90;
-  for I := 0 to High(ST) do
-  begin
-    Srv := GetServerFromTable(I, SL, ST);
+    // Game mode
     e_TextureFontPrintEx(mx + 2, y, g_Game_ModeToText(Srv.GameMode), 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(ST) do
-  begin
-    Srv := GetServerFromTable(I, SL, ST);
+    // 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);
-    y := y + 42;
-  end;
 
-  e_TextureFontPrintEx(mx + 106, 68, 'VER', gStdFont, 255, 127, 0, 1);
-  y := 90;
-  for I := 0 to High(ST) do
-  begin
-    Srv := GetServerFromTable(I, SL, ST);
+    // 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);
+  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;
 
-  function FindServerInTable(Name: string): Integer;
+  function FindServerInTable(Name: AnsiString): Integer;
   var
     i: Integer;
   begin
@@ -705,17 +1455,27 @@ begin
   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;
 begin
+  g_Net_Slist_Pulse();
+
   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;
@@ -727,14 +1487,24 @@ begin
     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
@@ -754,7 +1524,8 @@ 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
@@ -781,7 +1552,8 @@ 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
@@ -791,7 +1563,8 @@ 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
@@ -802,7 +1575,8 @@ 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
@@ -812,7 +1586,8 @@ 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
@@ -834,8 +1609,14 @@ 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.