X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=12d926f937c309fc94ff6c7b186cbe4be50491e9;hb=aa7e40301df69aa13c00ff2bcdb8e532b06b8053;hp=ae0b0de1e796fc2be6bcfb77c2ab7953b7ac8514;hpb=e979719019322a78e7fded8fd96130c18cf31972;p=d2df-sdl.git diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas index ae0b0de..12d926f 100644 --- a/src/game/g_netmaster.pas +++ b/src/game/g_netmaster.pas @@ -176,8 +176,11 @@ function GetTimerMS (): Int64; implementation uses + {$IFDEF ENABLE_MENU} + g_gui, g_menu, + {$ENDIF} {$IFNDEF HEADLESS} - g_gui, g_menu, r_game, g_system, + r_render, g_system, {$ENDIF} e_input, e_log, g_net, g_console, g_map, g_game, g_sound, g_options, g_language, g_basic, @@ -1758,7 +1761,7 @@ begin SL := nil; ST := nil; gState := STATE_MENU; -{$IFNDEF HEADLESS} +{$IFDEF ENABLE_MENU} g_GUI_ShowWindow('MainMenu'); g_GUI_ShowWindow('NetGameMenu'); g_GUI_ShowWindow('NetClientMenu'); @@ -1784,7 +1787,7 @@ begin slWaitStr := _lc[I_NET_SLIST_WAIT]; {$IFNDEF HEADLESS} - r_Game_Draw; + r_Render_Draw; sys_Repaint; {$ENDIF} @@ -1814,12 +1817,12 @@ begin Srv := GetServerFromTable(slSelection, SL, ST); if Srv.Password then begin -{$IFNDEF HEADLESS} +{$IFDEF ENABLE_MENU} PromptIP := Srv.IP; PromptPort := Srv.Port; {$ENDIF} gState := STATE_MENU; -{$IFNDEF HEADLESS} +{$IFDEF ENABLE_MENU} g_GUI_ShowWindow('ClientPasswordMenu'); {$ENDIF} SL := nil;