X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_window.pas;h=7a719b606d8b8446ef07f255519aa292bf126f67;hb=53a532345838de82821c8711ae5e2e35d34892c4;hp=37d979111dff1a34f01f50f30a3287c77f901493;hpb=8b47238d90490db2f55e66c72fe784be7232cc5d;p=d2df-sdl.git

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 37d9791..7a719b6 100644
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -22,10 +22,9 @@ uses
 
 function SDLMain (): Integer;
 procedure ResetTimer ();
-procedure ProcessLoading (forceUpdate: Boolean=false);
+procedure ProcessLoading (forceUpdate: Boolean = False);
 
 var
-  gwin_dump_extensions: Boolean = false;
   gwin_has_stencil: Boolean = false;
   gwin_k8_enable_light_experiments: Boolean = false;
   g_dbg_aimline_on: Boolean = false;
@@ -40,8 +39,8 @@ uses
 {$ENDIF}
 {$INCLUDE ../nogl/noGLuses.inc}
   SysUtils, Classes, MAPDEF, Math,
-  e_graphics, e_log, e_texture, g_main,
-  g_console, e_input, g_options, g_game,
+  r_graphics, e_log, e_texture, g_main,
+  g_console, r_console, e_input, g_options, g_game, r_game,
   g_basic, g_textures, e_sound, g_sound, g_menu, ENet, g_net,
   g_map, g_gfx, g_monsters, xprofiler,
   g_touch, g_gui, g_system, g_netmaster;
@@ -68,7 +67,7 @@ var
   prevLoadingUpdateTime: UInt64 = 0;
 {$ENDIF}
 
-procedure ProcessLoading (forceUpdate: Boolean=false);
+procedure ProcessLoading (forceUpdate: Boolean);
 {$IFNDEF HEADLESS}
 var
   stt: UInt64;
@@ -91,10 +90,10 @@ begin
       e_SetRendertarget(True);
       e_SetViewPort(0, 0, gScreenWidth, gScreenHeight);
 
-      DrawMenuBackground('INTER');
+      r_Game_DrawMenuBackground('INTER');
       e_DarkenQuadWH(0, 0, gScreenWidth, gScreenHeight, 150);
-      DrawLoadingStat();
-      g_Console_Draw(True);
+      r_Game_DrawLoadingStat();
+      r_Console_Draw(True);
 
       e_SetRendertarget(False);
       e_SetViewPort(0, 0, gWinSizeX, gWinSizeY);
@@ -108,14 +107,13 @@ begin
 
   e_SoundUpdate();
 
-  if NetMode = NET_SERVER then
-  begin
-    g_Net_Host_Update();
-  end
-  else
-  begin
-    if (NetMode = NET_CLIENT) and (NetState <> NET_STATE_AUTH) then g_Net_Client_UpdateWhileLoading();
-  end;
+  // TODO: At the moment, I left here only host network processing, because the client code must
+  // handle network events on its own. Otherwise separate network cases that use different calls to
+  // enet_host_service() WILL lose their packets (for example, resource downloading). So they have
+  // to handle everything by themselves. But in general, this MUST be removed completely, since
+  // updating the window should never affect the network. Use single enet_host_service(), period.
+  if NetMode = NET_SERVER
+    then g_Net_Host_Update();
 end;
 
 
@@ -257,8 +255,6 @@ begin
   begin
     arg := ParamStr(idx);
     Inc(idx);
-    if arg = '--opengl-dump-exts' then gwin_dump_extensions := true;
-    //if arg = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true;
     if arg = '--jah' then g_profile_history_size := 100;
     if arg = '--no-particles' then gpart_dbg_enabled := false;
     if arg = '--no-los' then gmon_dbg_los_enabled := false;
@@ -361,7 +357,6 @@ begin
     if (glLegacyNPOT) then e_logWriteln('NPOT texture emulation: enabled')
     else e_logWriteln('NPOT texture emulation: disabled');
   end;
-  gwin_dump_extensions := false;
 
   Init;
   Time_Old := sys_GetTicks();