X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=e708c13227bfd843e38f60a4fb4a243c9e4946b4;hb=bb931202515154fd56edaa5657d0f69f1cce0e75;hp=56dec596971af747214515d3d6de09d737355e15;hpb=e9689e89adc11f1179ee991bffa4d2be54f6e068;p=d2df-sdl.git diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas index 56dec59..e708c13 100644 --- a/src/game/g_netmaster.pas +++ b/src/game/g_netmaster.pas @@ -176,9 +176,18 @@ function GetTimerMS (): Int64; implementation uses + {$IFDEF ENABLE_MENU} + g_gui, g_menu, + {$ENDIF} + {$IFDEF ENABLE_RENDER} + r_render, + {$ENDIF} + {$IFNDEF HEADLESS} + g_system, + {$ENDIF} e_input, e_log, g_net, g_console, - g_map, g_game, g_sound, g_gui, g_menu, g_options, g_language, g_basic, r_game, - wadreader, g_system, utils, hashtable; + g_map, g_game, g_sound, g_options, g_language, g_basic, + wadreader, utils, hashtable; // ////////////////////////////////////////////////////////////////////////// // @@ -1742,7 +1751,11 @@ begin if gConsoleShow or gChatShow then Exit; - qm := sys_HandleInput(); // this updates kbd + {$IFDEF HEADLESS} + qm := True; + {$ELSE} + qm := sys_HandleInput(); // this updates kbd + {$ENDIF} if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or @@ -1751,10 +1764,12 @@ begin SL := nil; ST := nil; gState := STATE_MENU; +{$IFDEF ENABLE_MENU} g_GUI_ShowWindow('MainMenu'); g_GUI_ShowWindow('NetGameMenu'); g_GUI_ShowWindow('NetClientMenu'); g_Sound_PlayEx(WINDOW_CLOSESOUND); +{$ENDIF} Exit; end; @@ -1774,8 +1789,12 @@ begin begin slWaitStr := _lc[I_NET_SLIST_WAIT]; - r_Game_Draw; - sys_Repaint; + {$IFDEF ENABLE_RENDER} + r_Render_Draw; + {$ENDIF} + {$IFNDEF HEALESS} + sys_Repaint; + {$ENDIF} if g_Net_Slist_Fetch(SL) then begin @@ -1803,10 +1822,14 @@ begin Srv := GetServerFromTable(slSelection, SL, ST); if Srv.Password then begin +{$IFDEF ENABLE_MENU} PromptIP := Srv.IP; PromptPort := Srv.Port; +{$ENDIF} gState := STATE_MENU; +{$IFDEF ENABLE_MENU} g_GUI_ShowWindow('ClientPasswordMenu'); +{$ENDIF} SL := nil; ST := nil; slReturnPressed := True;