X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=120fcde446ff5d355e780370d129311e9723e9fb;hb=1e43b976bfe67d3e27398889d7fb7685bdc52bc5;hp=ae0b0de1e796fc2be6bcfb77c2ab7953b7ac8514;hpb=e979719019322a78e7fded8fd96130c18cf31972;p=d2df-sdl.git

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index ae0b0de..120fcde 100644
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
@@ -176,8 +176,14 @@ function GetTimerMS (): Int64;
 implementation
 
 uses
-  {$IFNDEF HEADLESS}
-    g_gui, g_menu, r_game, g_system,
+  {$IFDEF ENABLE_MENU}
+    g_gui, g_menu,
+  {$ENDIF}
+  {$IFDEF ENABLE_RENDER}
+    r_render,
+  {$ENDIF}
+  {$IFDEF ENABLE_SYSTEM}
+    g_system,
   {$ENDIF}
   e_input, e_log, g_net, g_console,
   g_map, g_game, g_sound, g_options, g_language, g_basic,
@@ -1745,10 +1751,10 @@ begin
   if gConsoleShow or gChatShow then
     Exit;
 
-  {$IFDEF HEADLESS}
-    qm := True;
-  {$ELSE}
+  {$IFDEF ENABLE_SYSTEM}
     qm := sys_HandleInput(); // this updates kbd
+  {$ELSE}
+    qm := True;
   {$ENDIF}
 
   if qm or e_KeyPressed(IK_ESCAPE) or e_KeyPressed(VK_ESCAPE) or
@@ -1758,7 +1764,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');
@@ -1783,10 +1789,12 @@ begin
     begin
       slWaitStr := _lc[I_NET_SLIST_WAIT];
 
-{$IFNDEF HEADLESS}
-      r_Game_Draw;
-      sys_Repaint;
-{$ENDIF}
+      {$IFDEF ENABLE_RENDER}
+        r_Render_Draw;
+      {$ENDIF}
+      {$IFDEF ENABLE_SYSTEM}
+        sys_Repaint;
+      {$ENDIF}
 
       if g_Net_Slist_Fetch(SL) then
       begin
@@ -1814,12 +1822,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;