X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=beada6a9377c123a784b1c935bfa559f91db4d4d;hb=7d53b8719f818712900fefb1c36e41b1fe9b3f32;hp=84f6544515de235e82b753cda05af9eb15fb718f;hpb=f0703eae1c66566c95d11bf44ff4560be416b971;p=d2df-sdl.git diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas index 84f6544..beada6a 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 @@ -55,19 +54,22 @@ type TNetServerTable = array of TNetServerRow; var - NetMHost: pENetHost = nil; - NetMPeer: pENetPeer = nil; + NetMHost: pENetHost = nil; + NetMPeer: pENetPeer = nil; slCurrent: TNetServerList = nil; slTable: TNetServerTable = nil; 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(); procedure g_Net_Slist_Remove(); -function g_Net_Slist_Connect(): Boolean; +function g_Net_Slist_Connect(blocking: Boolean=True): Boolean; procedure g_Net_Slist_Check(); procedure g_Net_Slist_Disconnect(); procedure g_Net_Slist_WriteInfo(); @@ -88,6 +90,11 @@ var slSelection: Byte = 0; slFetched: Boolean = False; slDirPressed: Boolean = False; + slReadUrgent: Boolean = False; + // 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` function GetTimerMS(): Int64; begin @@ -136,7 +143,7 @@ var InMsg: TMsg; SvAddr: ENetAddress; FromSL: Boolean; - UpdVer, MyVer: string; + MyVer, Str: string; procedure ProcessLocal(); begin @@ -263,11 +270,20 @@ begin if InMsg.ReadCount < InMsg.CurSize then begin // new master, supports version reports - UpdVer := InMsg.ReadString(); - if (UpdVer <> MyVer) then + Str := InMsg.ReadString(); + if (Str <> MyVer) then begin { TODO } - g_Console_Add('!!! UpdVer = `' + UpdVer + '`'); + 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; @@ -370,11 +386,40 @@ end; procedure g_Net_Slist_Update; var - P: pENetPacket; - + ct: Int64; begin - if (NetMHost = nil) or (NetMPeer = nil) then Exit; + if (NetMHost = nil) or (NetMPeer = nil) then exit; + + // we are waiting for connection + if (not NetHostConnected) then + begin + // check for connection packet + if (enet_host_service(NetMHost, @NetMEvent, 0) > 0) then + begin + if NetMEvent.kind = ENET_EVENT_TYPE_CONNECT then + begin + NetHostConnected := True; + g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_CONN]); + end + else + begin + if NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE then enet_packet_destroy(NetMEvent.packet); + end; + end; + // check for connection timeout + if (not NetHostConnected) then + begin + ct := GetTimerMS(); + if (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); + g_Net_Slist_Disconnect(); + exit; + end; + end; + end; NetOut.Clear(); NetOut.Write(Byte(NET_MMSG_UPD)); @@ -393,7 +438,7 @@ procedure g_Net_Slist_Remove; var P: pENetPacket; begin - if (NetMHost = nil) or (NetMPeer = nil) then Exit; + if (NetMHost = nil) or (NetMPeer = nil) or (not NetHostConnected) then Exit; NetOut.Clear(); NetOut.Write(Byte(NET_MMSG_DEL)); NetOut.Write(NetAddr.port); @@ -405,9 +450,13 @@ begin NetOut.Clear(); end; -function g_Net_Slist_Connect: Boolean; +function g_Net_Slist_Connect (blocking: Boolean=True): Boolean; +var + delay: Integer; begin Result := False; + NetHostConnected := False; // just in case + NetHostConReqTime := 0; // just in case NetMHost := enet_host_create(nil, 1, NET_MCHANS, 0, 0); if (NetMHost = nil) then @@ -425,10 +474,12 @@ begin Exit; end; - if (enet_host_service(NetMHost, @NetMEvent, 3000) > 0) then + if (blocking) then delay := 3000 else delay := 0; + if (enet_host_service(NetMHost, @NetMEvent, delay) > 0) then if NetMEvent.kind = ENET_EVENT_TYPE_CONNECT then begin Result := True; + NetHostConnected := True; g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_CONN]); Exit; end @@ -436,10 +487,22 @@ begin 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); + if (blocking) then + begin + g_Console_Add(_lc[I_NET_MSG_ERROR] + _lc[I_NET_SLIST_ERROR], True); - NetMHost := nil; - NetMPeer := nil; + if NetMPeer <> nil then enet_peer_reset(NetMPeer); + if NetMHost <> nil then enet_host_destroy(NetMHost); + NetMPeer := nil; + NetMHost := nil; + NetHostConnected := False; + NetHostConReqTime := 0; + end + else + begin + NetHostConReqTime := GetTimerMS(); + g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_WCONN]); + end; end; procedure g_Net_Slist_Disconnect; @@ -456,13 +519,15 @@ begin NetMPeer := nil; NetMHost := nil; + NetHostConnected := False; + NetHostConReqTime := 0; g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]); end; procedure g_Net_Slist_Check; begin - if (NetMHost = nil) or (NetMPeer = nil) then Exit; + if (NetMHost = nil) or (NetMPeer = nil) or (not NetHostConnected) then Exit; while (enet_host_service(NetMHost, @NetMEvent, 0) > 0) do begin @@ -473,6 +538,8 @@ begin if NetMHost <> nil then enet_host_destroy(NetMHost); NetMPeer := nil; NetMHost := nil; + NetHostConnected := False; + NetHostConReqTime := 0; Break; end else @@ -517,7 +584,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; @@ -535,15 +602,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, @@ -574,12 +675,12 @@ 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); @@ -620,10 +721,10 @@ begin 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); @@ -738,6 +839,15 @@ begin Exit; end; + // 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