X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=e6e7a6c5eed31414263719c61717a372ccf56d2f;hb=3e9b43c5a53e39e3651b946c11ec61387406b36c;hp=391d7729cf405f7e38ba25324f95318487e76af2;hpb=7089a87027fc4e9f9cc0319d3d09408efa276da2;p=d2df-sdl.git diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas index 391d772..e6e7a6c 100644 --- a/src/game/g_netmaster.pas +++ b/src/game/g_netmaster.pas @@ -173,7 +173,7 @@ implementation uses 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, + g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, g_basic, r_game, wadreader, g_system, utils, hashtable; @@ -1474,6 +1474,7 @@ begin exit; end; + Result := True; slMOTD := ''; { slUrgent := ''; @@ -1574,7 +1575,8 @@ begin for I := Low(SL) to High(SL) do if (SL[I].PingAddr.host = SvAddr.host) and (SL[I].PingAddr.port = SvAddr.port) and - (SL[I].Port = tmpsv.Port) then + (SL[I].Port = tmpsv.Port) and + (SL[I].Name = tmpsv.Name) then begin tmpsv.IP := SL[I].IP; SL[I] := tmpsv; @@ -1923,7 +1925,7 @@ begin begin slWaitStr := _lc[I_NET_SLIST_WAIT]; - g_Game_Draw; + r_Game_Draw; sys_Repaint; if g_Net_Slist_Fetch(SL) then