X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=05d79edd2647194b5ed45698221741b3bdc8feef;hb=92b319e1feed5079e42c779aa49b12ffa8672f54;hp=27eefa480656fea25a50ebe20af19d9c96904193;hpb=082b546b38711030b4490facbefa37a331cb1a37;p=d2df-sdl.git diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas index 27eefa4..05d79ed 100644 --- a/src/game/g_netmaster.pas +++ b/src/game/g_netmaster.pas @@ -1,4 +1,4 @@ -(* Copyright (C) DooM 2D:Forever Developers +(* Copyright (C) Doom 2D: Forever Developers * * 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 @@ -125,7 +125,7 @@ begin if not g_Net_Slist_Connect then Exit; - e_WriteLog('Fetching serverlist...', MSG_NOTIFY); + e_WriteLog('Fetching serverlist...', TMsgType.Notify); g_Console_Add(_lc[I_NET_MSG] + _lc[I_NET_SLIST_FETCH]); NetOut.Clear(); @@ -376,7 +376,7 @@ begin begin enet_address_set_host(@NetSlistAddr, PChar(Addr(IP[1]))); NetSlistAddr.Port := Port; - e_WriteLog('Masterserver address set to ' + IP + ':' + IntToStr(Port), MSG_NOTIFY); + e_WriteLog('Masterserver address set to ' + IP + ':' + IntToStr(Port), TMsgType.Notify); end; end; @@ -505,13 +505,15 @@ begin end; procedure g_Serverlist_Control(var SL: TNetServerList); +var + qm: Boolean; begin if gConsoleShow or gChatShow then Exit; - e_PollInput(); + qm := g_ProcessMessages(); // this updates kbd - if e_KeyPressed(IK_ESCAPE) then + if qm or e_KeyPressed(IK_ESCAPE) then begin SL := nil; gState := STATE_MENU;