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

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index 0f27d5f..e8a80d6 100644
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
@@ -63,6 +63,9 @@ var
   slWaitStr:       string = '';
   slReturnPressed: Boolean = True;
 
+  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();
@@ -80,13 +83,15 @@ 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;
+  g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, g_basic,
+  wadreader;
 
 var
   NetMEvent:      ENetEvent;
   slSelection:    Byte = 0;
   slFetched:      Boolean = False;
   slDirPressed:   Boolean = False;
+  slReadUrgent:   Boolean = False;
 
 function GetTimerMS(): Int64;
 begin
@@ -135,6 +140,7 @@ var
   InMsg: TMsg;
   SvAddr: ENetAddress;
   FromSL: Boolean;
+  MyVer, Str: string;
 
   procedure ProcessLocal();
   begin
@@ -215,6 +221,10 @@ 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_host_flush(NetMHost);
@@ -254,6 +264,26 @@ begin
         end;
       end;
 
+      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;
+
       Result := True;
       break;
     end;
@@ -476,6 +506,20 @@ end;
 
 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
@@ -486,7 +530,7 @@ end;
 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;
@@ -504,15 +548,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 +621,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,43 +654,23 @@ 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);
@@ -715,7 +771,9 @@ begin
 
   qm := g_ProcessMessages(); // 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,7 +785,17 @@ 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
@@ -754,7 +822,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 +850,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 +861,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 +873,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 +884,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,7 +907,12 @@ 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;