X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=f8246d64bf04c85ec4533c5e2204e431da5a8a40;hb=2304c541d7bdbf7de389437482ecdff37fc7fbd5;hp=41478f1cb94b74b6c0c8ef0b4b780366cd35fc99;hpb=91a5ffe08943e28ecdcf8bb6752f88ff220a4cd9;p=d2df-sdl.git

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index 41478f1..f8246d6 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;
@@ -45,48 +45,727 @@ type
     PingAddr: ENetAddress;
   end;
   pTNetServer = ^TNetServer;
+  TNetServerRow = record
+    Indices: Array of Integer;
+    Current: Integer;
+  end;
 
   TNetServerList = array of TNetServer;
   pTNetServerList = ^TNetServerList;
+  TNetServerTable = array of TNetServerRow;
 
-var
-  NetMHost:       pENetHost = nil;
-  NetMPeer:       pENetPeer = nil;
+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_Draw(var SL: TNetServerList);
-procedure g_Serverlist_Control(var SL: TNetServerList);
 
 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
+  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);
+
+  msg.Write(Byte(NET_PROTOCOL_VER));
+  msg.Write(Byte(NetPassword <> ''));
+end;
+
+
+//==========================================================================
+//
+//  TMasterHost.update
+//
+//==========================================================================
+procedure TMasterHost.update (immediateSend: Boolean=true);
 var
-  NetMEvent:      ENetEvent;
-  slSelection:    Byte = 0;
-  slFetched:      Boolean = False;
-  slDirPressed:   Boolean = False;
+  pkt: pENetPacket;
+begin
+  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;
+
+
+//==========================================================================
+//
+//  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;
 
-function GetTimerMS(): Int64;
+
+//==========================================================================
+//
+//  TMasterHost.clearPacket
+//
+//==========================================================================
+procedure TMasterHost.clearPacket ();
 begin
-  Result := GetTimer() {div 1000};
+  if (event.packet <> nil) then
+  begin
+    enet_packet_destroy(event.packet);
+    event.packet := nil;
+  end;
 end;
 
-procedure PingServer(var S: TNetServer; Sock: ENetSocket);
+
+//**************************************************************************
+//
+// 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;
@@ -104,7 +783,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
@@ -116,7 +801,13 @@ 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;
@@ -128,8 +819,9 @@ var
   InMsg: TMsg;
   SvAddr: ENetAddress;
   FromSL: Boolean;
+  MyVer, Str: string;
 
-  procedure ProcessLocal();
+  procedure ProcessLocal ();
   begin
     I := Length(SL);
     SetLength(SL, I + 1);
@@ -150,7 +842,8 @@ var
       Bots := InMsg.ReadWord();
     end;
   end;
-  procedure CheckLocalServers();
+
+  procedure CheckLocalServers ();
   begin
     SetLength(SL, 0);
 
@@ -186,17 +879,24 @@ var
 
     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 (length(mlist) = 0) or (not mlist[0].connect()) then
   begin
     CheckLocalServers();
     Exit;
   end;
 
-  if not g_Net_Slist_Connect then
+  if not mlist[0].waitForConnection() then
   begin
     CheckLocalServers();
     Exit;
@@ -208,51 +908,82 @@ begin
   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
@@ -265,8 +996,7 @@ begin
   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);
@@ -322,154 +1052,45 @@ begin
   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;
 
+//==========================================================================
+//
+//  GetServerFromTable
+//
+//==========================================================================
+function GetServerFromTable (Index: Integer; SL: TNetServerList; ST: TNetServerTable): TNetServer;
 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);
+  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;
-  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;
+  if (Index < 0) or (Index >= Length(ST)) then
     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]);
+  Result := SL[ST[Index].Indices[ST[Index].Current]];
 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;
-
-procedure g_Serverlist_Draw(var SL: TNetServerList);
+//==========================================================================
+//
+//  g_Serverlist_Draw
+//
+//==========================================================================
+procedure g_Serverlist_Draw (var SL: TNetServerList; var ST: TNetServerTable);
 var
-  sy, i, y, mw, mx, l: Integer;
+  Srv: TNetServer;
+  sy, i, y, mw, mx, l, motdh: Integer;
   cw: Byte = 0;
   ch: Byte = 0;
   ww: Word = 0;
@@ -487,15 +1108,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,
@@ -504,17 +1159,18 @@ begin
   end;
 
   y := 90;
-  if (slSelection < Length(SL)) then
+  if (slSelection < Length(ST)) then
   begin
     I := slSelection;
     sy := y + 42 * I - 4;
-    ip := _lc[I_NET_ADDRESS] + ' ' + SL[I].IP + ':' + IntToStr(SL[I].Port);
-    if SL[I].Password then
+    Srv := GetServerFromTable(I, SL, ST);
+    ip := _lc[I_NET_ADDRESS] + ' ' + Srv.IP + ':' + IntToStr(Srv.Port);
+    if Srv.Password then
       ip := ip + '  ' + _lc[I_NET_SERVER_PASSWORD] + ' ' + _lc[I_MENU_YES]
     else
       ip := ip + '  ' + _lc[I_NET_SERVER_PASSWORD] + ' ' + _lc[I_MENU_NO];
   end else
-    if Length(SL) > 0 then
+    if Length(ST) > 0 then
       slSelection := 0;
 
   mw := (gScreenWidth - 188);
@@ -525,84 +1181,174 @@ 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(SL) do
+  for I := 0 to High(ST) do
   begin
-    e_TextureFontPrintEx(18, y, SL[I].Name, gStdFont, 255, 255, 255, 1);
-    e_TextureFontPrintEx(18, y + 16, SL[I].Map, gStdFont, 210, 210, 210, 1);
+    Srv := GetServerFromTable(I, SL, ST);
+    // Name and map
+    e_TextureFontPrintEx(18, y, Srv.Name, gStdFont, 255, 255, 255, 1);
+    e_TextureFontPrintEx(18, y + 16, Srv.Map, gStdFont, 210, 210, 210, 1);
 
-    y := y + 42;
-  end;
-
-  e_TextureFontPrintEx(mx - 68, 68, 'PING', gStdFont, 255, 127, 0, 1);
-  y := 90;
-  for I := 0 to High(SL) do
-  begin
-    if (SL[I].Ping < 0) or (SL[I].Ping > 999) then
+    // Ping and similar count
+    if (Srv.Ping < 0) or (Srv.Ping > 999) then
       e_TextureFontPrintEx(mx - 68, y, _lc[I_NET_SLIST_NO_ACCESS], gStdFont, 255, 0, 0, 1)
     else
-      if SL[I].Ping = 0 then
+      if Srv.Ping = 0 then
         e_TextureFontPrintEx(mx - 68, y, '<1' + _lc[I_NET_SLIST_PING_MS], gStdFont, 255, 255, 255, 1)
       else
-        e_TextureFontPrintEx(mx - 68, y, IntToStr(SL[I].Ping) + _lc[I_NET_SLIST_PING_MS], gStdFont, 255, 255, 255, 1);
+        e_TextureFontPrintEx(mx - 68, y, IntToStr(Srv.Ping) + _lc[I_NET_SLIST_PING_MS], gStdFont, 255, 255, 255, 1);
 
-    y := y + 42;
-  end;
+    if Length(ST[I].Indices) > 1 then
+      e_TextureFontPrintEx(mx - 68, y + 16, '< ' + IntToStr(Length(ST[I].Indices)) + ' >', gStdFont, 210, 210, 210, 1);
 
-  e_TextureFontPrintEx(mx + 2, 68, 'MODE', gStdFont, 255, 127, 0, 1);
-  y := 90;
-  for I := 0 to High(SL) do
-  begin
-    e_TextureFontPrintEx(mx + 2, y, g_Game_ModeToText(SL[I].GameMode), gStdFont, 255, 255, 255, 1);
+    // Game mode
+    e_TextureFontPrintEx(mx + 2, y, g_Game_ModeToText(Srv.GameMode), gStdFont, 255, 255, 255, 1);
+
+    // Players
+    e_TextureFontPrintEx(mx + 54, y, IntToStr(Srv.Players) + '/' + IntToStr(Srv.MaxPlayers), gStdFont, 255, 255, 255, 1);
+    e_TextureFontPrintEx(mx + 54, y + 16, IntToStr(Srv.LocalPl) + '+' + IntToStr(Srv.Bots), gStdFont, 210, 210, 210, 1);
+
+    // Version
+    e_TextureFontPrintEx(mx + 106, y, IntToStr(Srv.Protocol), gStdFont, 255, 255, 255, 1);
 
     y := y + 42;
   end;
 
-  e_TextureFontPrintEx(mx + 54, 68, 'PLRS', gStdFont, 255, 127, 0, 1);
-  y := 90;
-  for I := 0 to High(SL) do
+  e_TextureFontPrintEx(20, motdh-20+3, ip, gStdFont, 205, 205, 205, 1);
+  ip := IntToStr(Length(ST)) + _lc[I_NET_SLIST_SERVERS];
+  e_TextureFontPrintEx(gScreenWidth - 48 - (Length(ip) + 1)*cw,
+    motdh-20+3, ip, gStdFont, 205, 205, 205, 1);
+end;
+
+
+//==========================================================================
+//
+//  g_Serverlist_GenerateTable
+//
+//==========================================================================
+procedure g_Serverlist_GenerateTable (SL: TNetServerList; var ST: TNetServerTable);
+var
+  i, j: Integer;
+
+  function FindServerInTable(Name: string): Integer;
+  var
+    i: Integer;
   begin
-    e_TextureFontPrintEx(mx + 54, y, IntToStr(SL[I].Players) + '/' + IntToStr(SL[I].MaxPlayers), gStdFont, 255, 255, 255, 1);
-    e_TextureFontPrintEx(mx + 54, y + 16, IntToStr(SL[I].LocalPl) + '+' + IntToStr(SL[I].Bots), gStdFont, 210, 210, 210, 1);
-    y := y + 42;
+    Result := -1;
+    if ST = nil then
+      Exit;
+    for i := Low(ST) to High(ST) do
+    begin
+      if Length(ST[i].Indices) = 0 then
+        continue;
+      if SL[ST[i].Indices[0]].Name = Name then
+      begin
+        Result := i;
+        Exit;
+      end;
+    end;
   end;
-
-  e_TextureFontPrintEx(mx + 106, 68, 'VER', gStdFont, 255, 127, 0, 1);
-  y := 90;
-  for I := 0 to High(SL) do
+  function ComparePing(i1, i2: Integer): Boolean;
+  var
+    p1, p2: Int64;
   begin
-    e_TextureFontPrintEx(mx + 106, y, IntToStr(SL[I].Protocol), gStdFont, 255, 255, 255, 1);
-
-    y := y + 42;
+    p1 := SL[i1].Ping;
+    p2 := SL[i2].Ping;
+    if (p1 < 0) then p1 := 999;
+    if (p2 < 0) then p2 := 999;
+    Result := p1 > p2;
+  end;
+  procedure SortIndices(var ind: Array of Integer);
+  var
+    I, J: Integer;
+    T: Integer;
+  begin
+    for I := High(ind) downto Low(ind) do
+      for J := Low(ind) to High(ind) - 1 do
+        if ComparePing(ind[j], ind[j+1]) then
+        begin
+          T := ind[j];
+          ind[j] := ind[j+1];
+          ind[j+1] := T;
+        end;
+  end;
+  procedure SortRows();
+  var
+    I, J: Integer;
+    T: TNetServerRow;
+  begin
+    for I := High(ST) downto Low(ST) do
+      for J := Low(ST) to High(ST) - 1 do
+        if ComparePing(ST[j].Indices[0], ST[j+1].Indices[0]) then
+        begin
+          T := ST[j];
+          ST[j] := ST[j+1];
+          ST[j+1] := T;
+        end;
+  end;
+begin
+  ST := nil;
+  if SL = nil then
+    Exit;
+  for i := Low(SL) to High(SL) do
+  begin
+    j := FindServerInTable(SL[i].Name);
+    if j = -1 then
+    begin
+      j := Length(ST);
+      SetLength(ST, j + 1);
+      ST[j].Current := 0;
+      SetLength(ST[j].Indices, 1);
+      ST[j].Indices[0] := i;
+    end
+    else
+    begin
+      SetLength(ST[j].Indices, Length(ST[j].Indices) + 1);
+      ST[j].Indices[High(ST[j].Indices)] := i;
+    end;
   end;
 
-  e_TextureFontPrintEx(20, gScreenHeight-61, ip, gStdFont, 205, 205, 205, 1);
-  ip := IntToStr(Length(SL)) + _lc[I_NET_SLIST_SERVERS];
-  e_TextureFontPrintEx(gScreenWidth - 48 - (Length(ip) + 1)*cw,
-    gScreenHeight-61, ip, gStdFont, 205, 205, 205, 1);
+  for i := Low(ST) to High(ST) do
+    SortIndices(ST[i].Indices);
+
+  SortRows();
 end;
 
-procedure g_Serverlist_Control(var SL: TNetServerList);
+
+//==========================================================================
+//
+//  g_Serverlist_Control
+//
+//==========================================================================
+procedure g_Serverlist_Control (var SL: TNetServerList; var ST: TNetServerTable);
 var
   qm: Boolean;
+  Srv: TNetServer;
 begin
   if gConsoleShow or gChatShow then
     Exit;
 
-  qm := g_ProcessMessages(); // this updates kbd
+  qm := sys_HandleInput(); // this updates kbd
 
-  if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) then
+  if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or
+     e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or
+     e_KeyPressed(JOY2_JUMP) or e_KeyPressed(JOY3_JUMP) then
   begin
     SL := nil;
+    ST := nil;
     gState := STATE_MENU;
     g_GUI_ShowWindow('MainMenu');
     g_GUI_ShowWindow('NetGameMenu');
@@ -611,14 +1357,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
@@ -630,6 +1386,7 @@ begin
           slWaitStr := _lc[I_NET_SLIST_ERROR];
       slFetched := True;
       slSelection := 0;
+      g_Serverlist_GenerateTable(SL, ST);
     end;
   end
   else
@@ -637,23 +1394,27 @@ 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
-      if SL[slSelection].Password then
+      Srv := GetServerFromTable(slSelection, SL, ST);
+      if Srv.Password then
       begin
-        PromptIP := SL[slSelection].IP;
-        PromptPort := SL[slSelection].Port;
+        PromptIP := Srv.IP;
+        PromptPort := Srv.Port;
         gState := STATE_MENU;
         g_GUI_ShowWindow('ClientPasswordMenu');
         SL := nil;
+        ST := nil;
         slReturnPressed := True;
         Exit;
       end
       else
-        g_Game_StartClient(SL[slSelection].IP, SL[slSelection].Port, '');
+        g_Game_StartClient(Srv.IP, Srv.Port, '');
       SL := nil;
+      ST := nil;
       slReturnPressed := True;
       Exit;
     end;
@@ -661,29 +1422,71 @@ 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
       Inc(slSelection);
-      if slSelection > High(SL) then slSelection := 0;
+      if slSelection > High(ST) then slSelection := 0;
       slDirPressed := True;
     end;
   end;
 
-  if e_KeyPressed(IK_UP) or e_KeyPressed(IK_KPUP) or e_KeyPressed(VK_UP) then
+  if e_KeyPressed(IK_UP) or e_KeyPressed(IK_KPUP) or e_KeyPressed(VK_UP) or
+     e_KeyPressed(JOY0_UP) or e_KeyPressed(JOY1_UP) or e_KeyPressed(JOY2_UP) or e_KeyPressed(JOY3_UP) then
   begin
     if not slDirPressed then
     begin
-      if slSelection = 0 then slSelection := Length(SL);
+      if slSelection = 0 then slSelection := Length(ST);
       Dec(slSelection);
 
       slDirPressed := True;
     end;
   end;
 
-  if (not e_KeyPressed(IK_DOWN)) and (not e_KeyPressed(IK_UP)) and (not e_KeyPressed(IK_KPDOWN)) and (not e_KeyPressed(IK_KPUP)) and (not e_KeyPressed(VK_DOWN)) and (not e_KeyPressed(VK_UP)) then
+  if e_KeyPressed(IK_RIGHT) or e_KeyPressed(IK_KPRIGHT) or e_KeyPressed(VK_RIGHT) or
+     e_KeyPressed(JOY0_RIGHT) or e_KeyPressed(JOY1_RIGHT) or e_KeyPressed(JOY2_RIGHT) or e_KeyPressed(JOY3_RIGHT) then
+  begin
+    if not slDirPressed then
+    begin
+      Inc(ST[slSelection].Current);
+      if ST[slSelection].Current > High(ST[slSelection].Indices) then ST[slSelection].Current := 0;
+      slDirPressed := True;
+    end;
+  end;
+
+  if e_KeyPressed(IK_LEFT) or e_KeyPressed(IK_KPLEFT) or e_KeyPressed(VK_LEFT) or
+     e_KeyPressed(JOY0_LEFT) or e_KeyPressed(JOY1_LEFT) or e_KeyPressed(JOY2_LEFT) or e_KeyPressed(JOY3_LEFT) then
+  begin
+    if not slDirPressed then
+    begin
+      if ST[slSelection].Current = 0 then ST[slSelection].Current := Length(ST[slSelection].Indices);
+      Dec(ST[slSelection].Current);
+
+      slDirPressed := True;
+    end;
+  end;
+
+  if (not e_KeyPressed(IK_DOWN)) and
+     (not e_KeyPressed(IK_UP)) and
+     (not e_KeyPressed(IK_RIGHT)) and
+     (not e_KeyPressed(IK_LEFT)) and
+     (not e_KeyPressed(IK_KPDOWN)) and
+     (not e_KeyPressed(IK_KPUP)) and
+     (not e_KeyPressed(IK_KPRIGHT)) and
+     (not e_KeyPressed(IK_KPLEFT)) and
+     (not e_KeyPressed(VK_DOWN)) and
+     (not e_KeyPressed(VK_UP)) and
+     (not e_KeyPressed(VK_RIGHT)) and
+     (not e_KeyPressed(VK_LEFT)) and
+     (not e_KeyPressed(JOY0_UP)) and (not e_KeyPressed(JOY1_UP)) and (not e_KeyPressed(JOY2_UP)) and (not e_KeyPressed(JOY3_UP)) and
+     (not e_KeyPressed(JOY0_DOWN)) and (not e_KeyPressed(JOY1_DOWN)) and (not e_KeyPressed(JOY2_DOWN)) and (not e_KeyPressed(JOY3_DOWN)) and
+     (not e_KeyPressed(JOY0_LEFT)) and (not e_KeyPressed(JOY1_LEFT)) and (not e_KeyPressed(JOY2_LEFT)) and (not e_KeyPressed(JOY3_LEFT)) and
+     (not e_KeyPressed(JOY0_RIGHT)) and (not e_KeyPressed(JOY1_RIGHT)) and (not e_KeyPressed(JOY2_RIGHT)) and (not e_KeyPressed(JOY3_RIGHT))
+ then
     slDirPressed := False;
 end;
 
+
 end.