X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=01d5d67ce153aec648034a1e37a373b8ad178d31;hb=5ecb6dd44de6bb04536ce3bddd5a4ef977a77420;hp=58667c978f15f1690d978e9c27d2993d279ca7df;hpb=8409c858d52cd818a95e91f126e336dfe73b93b6;p=d2df-sdl.git diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas index 58667c9..01d5d67 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,44 +54,116 @@ type TNetServerTable = array of TNetServerRow; var - 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_Update (immediateSend: Boolean=true); 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_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; + 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; + + 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; - -function GetTimerMS(): Int64; + NetMHost: pENetHost = nil; + NetMPeer: pENetPeer = nil; + NetMEvent: ENetEvent; + 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` + NetUpdatePending: Boolean = false; + + +function GetTimerMS (): Int64; begin Result := GetTimer() {div 1000}; end; + +// returns `false` if totally disconnected +function g_Net_Slist_IsConnectionActive (): Boolean; +begin + result := (NetMHost <> nil) and (NetMPeer <> nil); +end; + + +function g_Net_Slist_IsConnectionInProgress (): Boolean; +begin + if (NetMHost = nil) or (NetMPeer = nil) then begin result := false; exit; end; + result := (not NetHostConnected); +end; + + +// should be called only if host/peer is here +// returns `false` if not connected/dead +function ProcessPendingConnection (): Boolean; +var + ct: Int64; +begin + result := false; + if (NetMHost = nil) or (NetMPeer = nil) then exit; + // are we waiting for connection? + if (not NetHostConnected) then + begin + // check for connection event + if (enet_host_service(NetMHost, @NetMEvent, 0) > 0) then + begin + if (NetMEvent.kind = ENET_EVENT_TYPE_CONNECT) then + begin + NetHostConnected := true; + if NetUpdatePending then g_Net_Slist_Update(false); + g_Console_Add(_lc[I_NET_MSG]+_lc[I_NET_SLIST_CONN]); + result := true; + exit; + end; + if (NetMEvent.kind = ENET_EVENT_TYPE_RECEIVE) then enet_packet_destroy(NetMEvent.packet); + 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); + g_Net_Slist_Disconnect(false); + end; + exit; + end; + end; + result := true; +end; + + procedure PingServer(var S: TNetServer; Sock: ENetSocket); var Buf: ENetBuffer; @@ -135,6 +206,7 @@ var InMsg: TMsg; SvAddr: ENetAddress; FromSL: Boolean; + MyVer, Str: string; procedure ProcessLocal(); begin @@ -215,6 +287,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 +330,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; @@ -351,13 +447,18 @@ begin NetOut.Write(Byte(NetPassword <> '')); end; -procedure g_Net_Slist_Update; -var +procedure g_Net_Slist_Update (immediateSend: Boolean=true); +var P: pENetPacket; - begin - if (NetMHost = nil) or (NetMPeer = nil) then Exit; + if not ProcessPendingConnection() then + begin + NetUpdatePending := g_Net_Slist_IsConnectionInProgress(); + exit; + end; + + NetUpdatePending := false; NetOut.Clear(); NetOut.Write(Byte(NET_MMSG_UPD)); @@ -368,7 +469,7 @@ begin 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); + if (immediateSend) then enet_host_flush(NetMHost); NetOut.Clear(); end; @@ -376,7 +477,8 @@ procedure g_Net_Slist_Remove; var P: pENetPacket; begin - if (NetMHost = nil) or (NetMPeer = nil) then Exit; + if not ProcessPendingConnection() then exit; + NetOut.Clear(); NetOut.Write(Byte(NET_MMSG_DEL)); NetOut.Write(NetAddr.port); @@ -388,10 +490,22 @@ 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; + if g_Net_Slist_IsConnectionActive then + begin + if not blocking then exit; + g_Net_Slist_Disconnect(false); + end; + + NetHostConnected := False; // just in case + NetHostConReqTime := 0; // just in case + NetUpdatePending := false; + NetMHost := enet_host_create(nil, 1, NET_MCHANS, 0, 0); if (NetMHost = nil) then begin @@ -408,10 +522,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 @@ -419,17 +535,30 @@ 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; + NetUpdatePending := false; + end + else + begin + NetHostConReqTime := GetTimerMS(); + g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_WCONN]); + end; end; -procedure g_Net_Slist_Disconnect; +procedure g_Net_Slist_Disconnect (spamConsole: Boolean=true); begin if (NetMHost = nil) and (NetMPeer = nil) then Exit; - if NetMode = NET_SERVER then g_Net_Slist_Remove; + if (NetMode = NET_SERVER) and (NetHostConnected) then g_Net_Slist_Remove; enet_peer_disconnect(NetMPeer, 0); enet_host_flush(NetMHost); @@ -439,13 +568,18 @@ begin NetMPeer := nil; NetMHost := nil; + NetHostConnected := False; + NetHostConReqTime := 0; + NetUpdatePending := false; - g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_DISC]); + if (spamConsole) then 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 not ProcessPendingConnection() then exit; + + if (NetUpdatePending) then g_Net_Slist_Update(false); while (enet_host_service(NetMHost, @NetMEvent, 0) > 0) do begin @@ -456,6 +590,9 @@ begin if NetMHost <> nil then enet_host_destroy(NetMHost); NetMPeer := nil; NetMHost := nil; + NetHostConnected := False; + NetHostConReqTime := 0; + NetUpdatePending := false; Break; end else @@ -476,6 +613,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 +637,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 +655,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,12 +728,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); @@ -589,10 +774,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); @@ -693,7 +878,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; @@ -705,7 +892,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 @@ -732,7 +929,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 @@ -759,7 +957,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 @@ -769,7 +968,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 @@ -780,7 +980,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 @@ -790,7 +991,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 @@ -812,7 +1014,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;