X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_netmaster.pas;h=e92b08728be8ff3a9b6f120148cc97e2ff93519d;hb=1268da694ceafa746d756eb42050809ddf846b1b;hp=bb6f10e521e150e7a5d0e81087ee020c533fa333;hpb=98283c5d58028cf0b5204c44412f51c4a15e98a6;p=d2df-sdl.git

diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas
index bb6f10e..e92b087 100644
--- a/src/game/g_netmaster.pas
+++ b/src/game/g_netmaster.pas
@@ -176,9 +176,18 @@ function GetTimerMS (): Int64;
 implementation
 
 uses
-  e_input, e_log, g_window, 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;
+  {$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,
+  wadreader, utils, hashtable;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
@@ -200,7 +209,7 @@ var
 //==========================================================================
 function GetTimerMS (): Int64;
 begin
-  Result := sys_GetTicks() {div 1000};
+  Result := GetTickCount64() {div 1000};
 end;
 
 
@@ -1743,7 +1752,11 @@ begin
   if gConsoleShow or gChatShow then
     Exit;
 
-  qm := sys_HandleInput(); // this updates kbd
+  {$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
      e_KeyPressed(JOY0_JUMP) or e_KeyPressed(JOY1_JUMP) or
@@ -1752,10 +1765,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;
 
@@ -1775,8 +1790,9 @@ begin
     begin
       slWaitStr := _lc[I_NET_SLIST_WAIT];
 
-      r_Game_Draw;
-      sys_Repaint;
+      {$IFDEF ENABLE_RENDER}
+        r_Render_Draw;
+      {$ENDIF}
 
       if g_Net_Slist_Fetch(SL) then
       begin
@@ -1804,10 +1820,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;